acme/README.md

@@ -1,22 +1,21 @@
 # ACME - snippet to obtain let´s encrpyt certificates authenticated by DNS-01
 
+## Prerequisites
+* bash
+* curl
+* openssl
+* cron
+
 ## Dockerfile:
 ```
 ADD ./snippets/acme/dehydrated /dehydrated/
 ADD ./snippets/acme/config /dehydrated/config
 ADD ./snippets/acme/get_cert_ddns01.sh /app/get_cert_ddns01.sh
 ADD ./snippets/acme/zwackl_hook.sh /app/zwackl_hook.sh
+ADD ./snippets/acme/cronjob.daily /etc/periodic/daily/acme
 ```
 **Do not forget to include the cron snippet!**
 
-## Cronjob
-`/etc/periodic/daily/acme`:
-```
-#!/bin/bash
-
-. /cron_env && /dehydrated/dehydrated --cron -t dns-01 -k /app/zwackl_hook.sh && ${ACME_RELOAD_CMD}
-```
-
 ## Environment
 * ACME_FQDNS (required)
 * ACME_RELOAD_CMD (required)
@@ -24,3 +23,4 @@ ADD ./snippets/acme/zwackl_hook.sh /app/zwackl_hook.sh
 * STAGING_URI (optional)
 * DDNS01URI (required)
 * DDNS01KEY (required)
+* DDNS01_ONECERT (optional)

acme/get_cert_ddns01.sh

@@ -10,7 +10,7 @@ if [ ! -z "${ACME_FQDNS+x}" ]; then
     exit 1
   fi
   if [ ! -d /secrets/ssl ]; then
-    mkdir -p /secrets/ssl
+    install -d -m 775 /secrets/ssl
   fi
   if [ ! -z "${ACME_STAGING_ENABLED+x}" ]; then
     STAGING_URI='CA="https://acme-staging-v02.api.letsencrypt.org/directory"' \
@@ -40,18 +40,15 @@ if [ ! -z "${ACME_FQDNS+x}" ]; then
     fi
     echo -n "" > /dehydrated/domains.txt
     for fqdn in ${ACME_FQDNS}; do
-      echo "${fqdn}"
       echo "${ONELINE}" "${fqdn} " >> /dehydrated/domains.txt
       if [ ! -d "/secrets/ssl/${fqdn}" ]; then
-        mkdir -p "/secrets/ssl/${fqdn}"
+        install -d -m 775 "/secrets/ssl/${fqdn}"
       fi
     done
     if [ ! -z "${ONELINE}" ]; then
       echo "" >> /dehydrated/domains.txt
     fi
     chmod +x /app/zwackl_hook.sh
-#    chmod +x /dehydrated/renew_certs
-#    ln -f -s /dehydrated/renew_certs /etc/periodic/daily/renew_certs
     if [ -z "$(ls -A /dehydrated/accounts)" ]; then
       cd /dehydrated && /dehydrated/dehydrated --register --accept-terms
     fi
@@ -66,7 +63,7 @@ if [ ! -z "${ACME_FQDNS+x}" ]; then
     if [ ! -z "${RUN_DEHYDRATED}" ]; then
       /dehydrated/dehydrated --cron -t dns-01 -k /app/zwackl_hook.sh
     fi
-    export CROND_ENABLE='acme'
+    chmod -R +x /dehydrated/certs
   else
     echo "Directory /dehydrated not found!"
     exit 1

cron/start_cron.sh

@@ -1,6 +1,5 @@
 #!/bin/sh
 
-if [ ! -z "${CROND_ENABLE+x}" ]; then
 # serialize ENV for cron-jobs
 TMP_FILE=/tmp/cron_env
 OUT_FILE=/cron_env
@@ -25,5 +24,4 @@ if [ ! -z "${CROND_ENABLE+x}" ]; then
 unlink "${TMP_FILE}"
 # start crond in background
 /usr/sbin/crond -b -S
-fi