Skip to content

Commit

Permalink
Add title to web-payment input page.
Browse files Browse the repository at this point in the history
  • Loading branch information
lgarron committed Apr 13, 2017
1 parent e2b51e1 commit b0c1380
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 0 deletions.
15 changes: 15 additions & 0 deletions certs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,14 @@ $(O)/gen/csr/ca-intermediate.csr: src/conf/ca-intermediate.conf $(O)/gen/key/ca-
$(O)/gen/crt/ca-intermediate.crt: src/conf/ca-intermediate.conf $(O)/gen/csr/ca-intermediate.csr $(O)/gen/key/ca-root.key $(O)/gen/crt/ca-root.crt
./tool sign $@ $(D) $(SIGN_CA_DEFAULTS) $^

################################
$(O)/gen/key/ca-sha1-intermediate.key:
./tool gen-key $@ $(D) 4096
$(O)/gen/csr/ca-sha1-intermediate.csr: src/conf/ca-intermediate.conf $(O)/gen/key/ca-sha1-intermediate.key
./tool gen-csr $@ $(D) $^
$(O)/gen/crt/ca-sha1-intermediate.crt: src/conf/ca-intermediate.conf $(O)/gen/csr/ca-sha1-intermediate.csr $(O)/gen/key/ca-root.key $(O)/gen/crt/ca-root.crt
./tool sign $@ $(D) 3650 sha1 req_v3_ca $^

################################
$(O)/gen/key/leaf-main.key: $(O)/gen/key/leaf-$(MAIN_CERT_TYPE).key
cp $< $@
Expand Down Expand Up @@ -98,6 +106,13 @@ CHAINS_PROD += $(O)/gen/chain/wildcard-sha1-2017.pem
$(O)/gen/chain/wildcard-sha1-2017.pem: $(O)/gen/crt/wildcard-sha1-2017.crt $(O)/gen/crt/ca-intermediate.crt
./tool chain $@ $(D) $^

################################
$(O)/gen/crt/wildcard-sha1-intermediate.crt: src/conf/wildcard.conf $(O)/gen/csr/wildcard-main.csr $(O)/gen/key/ca-sha1-intermediate.key $(O)/gen/crt/ca-sha1-intermediate.crt
./tool sign $@ $(D) $(SIGN_LEAF_DEFAULTS) $^
CHAINS_PROD += $(O)/gen/chain/wildcard-sha1-intermediate.pem
$(O)/gen/chain/wildcard-sha1-intermediate.pem: $(O)/gen/crt/wildcard-sha1-intermediate.crt $(O)/gen/crt/ca-sha1-intermediate.crt
./tool chain $@ $(D) $^

################################
$(O)/gen/crt/wildcard-md5.crt: src/conf/wildcard.conf $(O)/gen/csr/wildcard-main.csr $(O)/gen/key/ca-intermediate.key $(O)/gen/crt/ca-intermediate.crt
./tool sign $@ $(D) $(DAYS_DEFAULT) md5 req_v3_usr $^
Expand Down
1 change: 1 addition & 0 deletions common/input/web-payment/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
title: web-payment
layout: page
favicon: gray
background: gray
Expand Down
19 changes: 19 additions & 0 deletions domains/cert/sha1-intermediate.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
---
server {
listen 80;
server_name sha1-intermediate.{{ site.domain }};

return 301 https://$server_name$request_uri;
}

server {
listen 443;
server_name sha1-intermediate.{{ site.domain }};

include {{ site.serving-path }}/nginx-includes/wildcard-sha1-intermediate.conf;
include {{ site.serving-path }}/nginx-includes/tls-defaults.conf;
include {{ site.serving-path }}/common/common.conf;

root {{ site.serving-path }}/domains/cert/sha1-intermediate;
}
16 changes: 16 additions & 0 deletions domains/cert/sha1-intermediate/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
subdomain: sha1-interemediate
layout: page
favicon: yellow
background: rgb(246, 207, 47)
---

<div id="content">
<h1 style="font-size: 8vw;">
{{ page.subdomain }}.<br>{{ site.domain }}
</h1>
</div>

<div id="footer">
The intermediate issuer certificate for this site is signed using SHA-1.
</div>
6 changes: 6 additions & 0 deletions nginx-includes/wildcard-sha1-intermediate.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
---

ssl on;
ssl_certificate {{ site.cert-path }}/wildcard-sha1-intermediate.pem;
ssl_certificate_key /etc/keys/leaf-main.key;

0 comments on commit b0c1380

Please sign in to comment.