Fixups; Changed startup logic (We need Nginx up for ACME HTTP challenge)

Author: DanielDent

Dockerfile

@@ -11,7 +11,6 @@ COPY services.d/nginx/* /etc/services.d/nginx/
 COPY services.d/simp_le/* /etc/services.d/simp_le/
 COPY nginx.conf /etc/nginx/
 COPY proxy.conf /etc/nginx/conf.d/default.conf
-COPY get-certificate.sh /etc/cont-init.d/
 COPY dhparams.pem /etc/nginx/
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \
@@ -48,7 +47,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \
     && rm ips-v6 ips-v4 \
     && echo "---> Fixing permissions" \
     && mkdir /certs \
-    && chmod +x /etc/services.d/*/* /etc/cont-init.d/get-certificate.sh \
+    && chmod +x /etc/services.d/*/* \
     && echo "---> Cleaning up" \
     && rm -Rf /var/lib/apt /var/cache/apt
 

get-certificate.sh

@@ -1,5 +1,5 @@
 upstream origin {
-    server ${UPSTREAM:-upstream};
+    server ${UPSTREAM:-127.0.0.1};
 }
 
 server {
@@ -11,7 +11,7 @@ server {
     # Performance + Privacy improvements
     ssl_stapling on;
     ssl_stapling_verify on;
-    ssl_trusted_certificate /certs/server-fullchain.pem;
+    ssl_trusted_certificate /certs/server-cert.pem;
     resolver 8.8.8.8 208.67.222.222 valid=300s;
     resolver_timeout 5s;
 

proxy.conf

@@ -1,14 +1,26 @@
 #!/usr/bin/with-contenv bash
 
+if [ -z "$SERVERNAME" ]; then
+    echo "ERROR: Server name must be specified..."
+    exit 1
+fi
+
+echo Waiting for Nginx to come up...
+until wget -T 1 --tries 0 http://127.0.0.1/; do
+    sleep 1s
+done
+echo Nginx has arrived.
+
 cd /certs
 
 while true; do
 
-    BIGSLEEP="$(( 360 + $(($RANDOM % 360)) ))"m # 6-12 hours
-
-    if /etc/cont-init.d/get-certificate.sh; then
+    if simp_le --cert_key_size 2048 -d $SERVERNAME:/usr/share/nginx/html -f key.pem -f cert.pem -f fullchain.pem; then
+        cp key.pem server-key.pem
+        cp fullchain.pem server-cert.pem # Nginx needs the intermediate certificate along with the server cert.
         nginx -s reload
     else
+        BIGSLEEP="$(( 360 + $(($RANDOM % 360)) ))"m # 6-12 hours
         sleep $BIGSLEEP
     fi