diff --git a/CHANGELOG.md b/CHANGELOG.md index 1130398e..9e0c9370 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,7 @@ The **patch** part changes incrementally at each release. ### Changed -* evoacme: Don't ignore hooks with . in the name (ignore when it's ".disable") +* evoacme: upstream release 20.11 ### Fixed diff --git a/evoacme/files/evoacme.sh b/evoacme/files/evoacme.sh index 6db0cab7..431b8162 100755 --- a/evoacme/files/evoacme.sh +++ b/evoacme/files/evoacme.sh @@ -284,13 +284,19 @@ main() { export EVOACME_CHAIN="${LIVE_CHAIN}" export EVOACME_FULLCHAIN="${LIVE_FULLCHAIN}" + # emulate certbot hooks environment variables + export RENEWED_LINEAGE="${LIVE_CHAIN}" + export RENEWED_DOMAINS="${VHOST}" + # search for files in hooks directory for hook in $(find ${HOOKS_DIR} -type f -executable | sort); do + set +e # keep only executables files, not containing a "." if [ -x "${hook}" ] && (basename "${hook}" | grep -vqF ".disable"); then debug "Executing ${hook}" ${hook} fi + set -e done } @@ -303,7 +309,7 @@ readonly QUIET=${QUIET:-"0"} readonly TEST=${TEST:-"0"} readonly DRY_RUN=${DRY_RUN:-"0"} -readonly VERSION="20.08" +readonly VERSION="20.11" # Read configuration file, if it exists [ -r /etc/default/evoacme ] && . /etc/default/evoacme diff --git a/evoacme/files/make-csr.sh b/evoacme/files/make-csr.sh index 372c58fc..78512e3a 100755 --- a/evoacme/files/make-csr.sh +++ b/evoacme/files/make-csr.sh @@ -265,7 +265,7 @@ readonly ARGS=$@ readonly VERBOSE=${VERBOSE:-"0"} readonly QUIET=${QUIET:-"0"} -readonly VERSION="20.08" +readonly VERSION="20.11" # Read configuration file, if it exists [ -r /etc/default/evoacme ] && . /etc/default/evoacme diff --git a/evoacme/files/vhost-domains.sh b/evoacme/files/vhost-domains.sh index 41b065b6..f20e5dba 100755 --- a/evoacme/files/vhost-domains.sh +++ b/evoacme/files/vhost-domains.sh @@ -170,7 +170,7 @@ readonly ARGS=$@ readonly VERBOSE=${VERBOSE:-"0"} readonly QUIET=${QUIET:-"0"} -readonly VERSION="20.08" +readonly VERSION="20.11" readonly SRV_IP=${SRV_IP:-""}