Restore working state by refactoring Makefile and Nginx config

Dockerfile

@@ -10,13 +10,12 @@ RUN apt-get update && apt-get install -y \
     nginx \
     ruby \
     ruby-dev
-RUN gem update --system
 RUN gem install jekyll
 
 # Install badssl.com
-ADD . badssl.com
-WORKDIR badssl.com
+ADD . /badssl.com
+WORKDIR /badssl.com
 RUN make inside-docker
 
 # Start things up!
-CMD nginx && tail -f /var/log/nginx/access.log /var/log/nginx/error.log
+CMD ["/bin/bash", "-c", "nginx && tail -f /var/log/nginx/access.log /var/log/nginx/error.log"]

certs/Makefile

@@ -93,12 +93,12 @@ $(O)/gen/crt/ca-intermediate.crt: src/conf/ca-intermediate.conf $(O)/gen/csr/ca-
 $(O)/gen/key/leaf-main.key:
 	./tool gen-key $@ $(D) 2048
 $(O)/gen/csr/wildcard-main.csr: src/conf/wildcard.conf $(O)/gen/key/leaf-main.key
-       ./tool gen-csr $@ $(D) $^
+	./tool gen-csr $@ $(D) $^
 $(O)/gen/crt/wildcard-main.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) $(SIGN_LEAF_DEFAULTS) $^
+	./tool sign $@ $(D) $(SIGN_LEAF_DEFAULTS) $^
 CHAINS_PROD += $(O)/gen/chain/wildcard-main.pem
 $(O)/gen/chain/wildcard-main.pem: $(O)/gen/crt/wildcard-main.crt $(O)/gen/crt/ca-intermediate.crt
-       ./tool chain $@ $(D) $^
+	./tool chain $@ $(D) $^
 
 ################################
 $(O)/gen/csr/fallback.csr: src/conf/fallback.conf $(O)/gen/key/leaf-main.key

nginx-includes/subdomain-1000-sans.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/subdomain-1000-sans.pem;
 ssl_certificate_key /etc/keys/leaf-main.key;

nginx-includes/subdomain-10000-sans.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/subdomain-10000-sans.pem;
 ssl_certificate_key /etc/keys/leaf-main.key;

nginx-includes/subdomain-blocked-interception.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/subdomain-blocked-interception.pem;
 ssl_certificate_key /etc/keys/leaf-blocked-interception.key;

nginx-includes/subdomain-captive-portal.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/subdomain-captive-portal.pem;
 ssl_certificate_key /etc/keys/leaf-captive-portal.key;

nginx-includes/subdomain-invalid-expected-sct.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/subdomain-invalid-expected-sct.pem;
 ssl_certificate_key /etc/keys/leaf-main.key;

nginx-includes/subdomain-known-interception.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/subdomain-known-interception.pem;
 ssl_certificate_key /etc/keys/leaf-known-interception.key;

nginx-includes/subdomain-mitm-software.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/subdomain-mitm-software.pem;
 ssl_certificate_key /etc/keys/leaf-main.key;

nginx-includes/subdomain-no-common-name.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/subdomain-no-common-name.pem;
 ssl_certificate_key /etc/keys/leaf-main.key;

nginx-includes/subdomain-no-san.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/subdomain-no-san.pem;
 ssl_certificate_key /etc/keys/leaf-main.key;

nginx-includes/subdomain-no-sct.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/subdomain-no-sct.pem;
 ssl_certificate_key /etc/keys/leaf-main.key;

nginx-includes/subdomain-no-subject.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/subdomain-no-subject.pem;
 ssl_certificate_key /etc/keys/leaf-main.key;

nginx-includes/subdomain-preloaded-expect-ct.conf

@@ -1,7 +1,6 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/subdomain-preloaded-expect-ct.pem;
 ssl_certificate_key /etc/keys/leaf-main.key;
 

nginx-includes/subdomain-reversed-chain.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/subdomain-reversed-chain.pem;
 ssl_certificate_key /etc/keys/ca-intermediate.key;

nginx-includes/subdomain-revoked.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/subdomain-revoked.pem;
 ssl_certificate_key /etc/keys/leaf-revoked.key;

nginx-includes/subdomain-xn--n1aae7f7o.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/subdomain-xn--n1aae7f7o.pem;
 ssl_certificate_key /etc/keys/leaf-main.key;

nginx-includes/wildcard-ecc256.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/wildcard-ecc256.pem;
 ssl_certificate_key /etc/keys/leaf-ecc256.key;

nginx-includes/wildcard-ecc384.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/wildcard-ecc384.pem;
 ssl_certificate_key /etc/keys/leaf-ecc384.key;

nginx-includes/wildcard-expired.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/wildcard-expired.pem;
 ssl_certificate_key /etc/keys/leaf-main.key;

nginx-includes/wildcard-fallback.conf

@@ -1,6 +1,6 @@
 ---
 ---
 
-ssl on;
+
 ssl_certificate {{ site.cert-path }}/fallback.pem;
 ssl_certificate_key /etc/keys/leaf-main.key;

nginx-includes/wildcard-incomplete-chain.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/wildcard-incomplete-chain.pem;
 ssl_certificate_key /etc/keys/leaf-main.key;

nginx-includes/wildcard-rsa2048.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/wildcard-rsa2048.pem;
 ssl_certificate_key /etc/keys/leaf-rsa2048.key;

nginx-includes/wildcard-rsa3072.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/wildcard-rsa3072.pem;
 ssl_certificate_key /etc/keys/leaf-rsa3072.key;

nginx-includes/wildcard-rsa4096.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/wildcard-rsa4096.pem;
 ssl_certificate_key /etc/keys/leaf-rsa4096.key;

nginx-includes/wildcard-rsa8192.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/wildcard-rsa8192.pem;
 ssl_certificate_key /etc/keys/leaf-rsa8192.key;

nginx-includes/wildcard-self-signed.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/wildcard-self-signed.pem;
 ssl_certificate_key /etc/keys/leaf-main.key;

nginx-includes/wildcard-sha384.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/wildcard-sha384.pem;
 ssl_certificate_key /etc/keys/leaf-main.key;

nginx-includes/wildcard-sha512.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/wildcard-sha512.pem;
 ssl_certificate_key /etc/keys/leaf-main.key;

nginx-includes/wildcard-untrusted-root.conf

@@ -1,6 +1,5 @@
 ---
 ---
 
-ssl on;
 ssl_certificate {{ site.cert-path }}/wildcard-untrusted-root.pem;
 ssl_certificate_key /etc/keys/leaf-main.key;