Procházet zdrojové kódy

[ACME] Force renewal with force_renew file, docs will follow

andryyy před 5 roky
rodič
revize
e19e6b9e92

+ 1 - 0
data/Dockerfiles/acme/acme.sh

@@ -345,6 +345,7 @@ while true; do
 
 
   # reload on new or changed certificates
   # reload on new or changed certificates
   if [[ "${CERT_CHANGED}" == "1" ]]; then
   if [[ "${CERT_CHANGED}" == "1" ]]; then
+    rm -f "${ACME_BASE}/force_renew" 2> /dev/null
     CERT_AMOUNT_CHANGED=${CERT_AMOUNT_CHANGED} /srv/reload-configurations.sh
     CERT_AMOUNT_CHANGED=${CERT_AMOUNT_CHANGED} /srv/reload-configurations.sh
   fi
   fi
 
 

+ 2 - 2
data/Dockerfiles/acme/obtain-certificate.sh

@@ -39,8 +39,8 @@ else
 fi
 fi
 
 
 if [[ -f ${DOMAINS_FILE} && "$(cat ${DOMAINS_FILE})" ==  "${CERT_DOMAINS[*]}" ]]; then
 if [[ -f ${DOMAINS_FILE} && "$(cat ${DOMAINS_FILE})" ==  "${CERT_DOMAINS[*]}" ]]; then
-  if [[ ! -f ${CERT} || ! -f "${KEY}" ]]; then
-    log_f "Certificate ${CERT} doesn't exist yet - start obtaining"
+  if [[ ! -f ${CERT} || ! -f "${KEY}" || -f "${ACME_BASE}/force_renew" ]]; then
+    log_f "Certificate ${CERT} doesn't exist yet or forced renewal - start obtaining"
   # Certificate exists and did not change but could be due for renewal (30 days)
   # Certificate exists and did not change but could be due for renewal (30 days)
   elif ! openssl x509 -checkend 2592000 -noout -in ${CERT} > /dev/null; then
   elif ! openssl x509 -checkend 2592000 -noout -in ${CERT} > /dev/null; then
     log_f "Certificate ${CERT} is due for renewal (< 30 days) - start renewing"
     log_f "Certificate ${CERT} is due for renewal (< 30 days) - start renewing"

+ 1 - 1
docker-compose.yml

@@ -333,7 +333,7 @@ services:
     acme-mailcow:
     acme-mailcow:
       depends_on:
       depends_on:
         - nginx-mailcow
         - nginx-mailcow
-      image: mailcow/acme:1.67
+      image: mailcow/acme:1.68
       dns:
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
         - ${IPV4_NETWORK:-172.22.1}.254
       environment:
       environment: