evoacme: upstream release 20.08
This commit is contained in:
parent
8ea1bac000
commit
a60deb276b
|
@ -37,7 +37,7 @@ The **patch** part changes incrementally at each release.
|
||||||
* certbot: install certbot dependencies non-interactively for jessie
|
* certbot: install certbot dependencies non-interactively for jessie
|
||||||
* elasticsearch: set tmpdir before datadir
|
* elasticsearch: set tmpdir before datadir
|
||||||
* elasticsearch: configure cluster with seed hosts and initial masters
|
* elasticsearch: configure cluster with seed hosts and initial masters
|
||||||
* evoacme: upstream release 20.06.1
|
* evoacme: upstream release 20.08
|
||||||
* evoacme: read values from environment before defaults file
|
* evoacme: read values from environment before defaults file
|
||||||
* evoacme: update for new certbot role
|
* evoacme: update for new certbot role
|
||||||
* haproxy: deport SSL tuning to Mozilla SSL generator
|
* haproxy: deport SSL tuning to Mozilla SSL generator
|
||||||
|
|
|
@ -285,7 +285,7 @@ main() {
|
||||||
export EVOACME_FULLCHAIN="${LIVE_FULLCHAIN}"
|
export EVOACME_FULLCHAIN="${LIVE_FULLCHAIN}"
|
||||||
|
|
||||||
# search for files in hooks directory
|
# search for files in hooks directory
|
||||||
for hook in $(find ${HOOKS_DIR} -type f); do
|
for hook in $(find ${HOOKS_DIR} -type f -executable | sort); do
|
||||||
# keep only executables files, not containing a "."
|
# keep only executables files, not containing a "."
|
||||||
if [ -x "${hook}" ] && (basename "${hook}" | grep -vqF "."); then
|
if [ -x "${hook}" ] && (basename "${hook}" | grep -vqF "."); then
|
||||||
debug "Executing ${hook}"
|
debug "Executing ${hook}"
|
||||||
|
@ -303,7 +303,7 @@ readonly QUIET=${QUIET:-"0"}
|
||||||
readonly TEST=${TEST:-"0"}
|
readonly TEST=${TEST:-"0"}
|
||||||
readonly DRY_RUN=${DRY_RUN:-"0"}
|
readonly DRY_RUN=${DRY_RUN:-"0"}
|
||||||
|
|
||||||
readonly VERSION="20.06.1"
|
readonly VERSION="20.08"
|
||||||
|
|
||||||
# Read configuration file, if it exists
|
# Read configuration file, if it exists
|
||||||
[ -r /etc/default/evoacme ] && . /etc/default/evoacme
|
[ -r /etc/default/evoacme ] && . /etc/default/evoacme
|
||||||
|
@ -314,7 +314,7 @@ readonly ACME_DIR=${ACME_DIR:-"/var/lib/letsencrypt"}
|
||||||
readonly CSR_DIR=${CSR_DIR:-"/etc/ssl/requests"}
|
readonly CSR_DIR=${CSR_DIR:-"/etc/ssl/requests"}
|
||||||
readonly CRT_DIR=${CRT_DIR:-"/etc/letsencrypt"}
|
readonly CRT_DIR=${CRT_DIR:-"/etc/letsencrypt"}
|
||||||
readonly LOG_DIR=${LOG_DIR:-"/var/log/evoacme"}
|
readonly LOG_DIR=${LOG_DIR:-"/var/log/evoacme"}
|
||||||
readonly HOOKS_DIR=${HOOKS_DIR:-"${CRT_DIR}/hooks"}
|
readonly HOOKS_DIR=${HOOKS_DIR:-"${CRT_DIR}/renewal-hooks/deploy"}
|
||||||
readonly SSL_MINDAY=${SSL_MINDAY:-"30"}
|
readonly SSL_MINDAY=${SSL_MINDAY:-"30"}
|
||||||
readonly SSL_EMAIL=${SSL_EMAIL:-""}
|
readonly SSL_EMAIL=${SSL_EMAIL:-""}
|
||||||
|
|
||||||
|
|
|
@ -265,7 +265,7 @@ readonly ARGS=$@
|
||||||
readonly VERBOSE=${VERBOSE:-"0"}
|
readonly VERBOSE=${VERBOSE:-"0"}
|
||||||
readonly QUIET=${QUIET:-"0"}
|
readonly QUIET=${QUIET:-"0"}
|
||||||
|
|
||||||
readonly VERSION="20.06.1"
|
readonly VERSION="20.08"
|
||||||
|
|
||||||
# Read configuration file, if it exists
|
# Read configuration file, if it exists
|
||||||
[ -r /etc/default/evoacme ] && . /etc/default/evoacme
|
[ -r /etc/default/evoacme ] && . /etc/default/evoacme
|
||||||
|
|
|
@ -170,7 +170,7 @@ readonly ARGS=$@
|
||||||
readonly VERBOSE=${VERBOSE:-"0"}
|
readonly VERBOSE=${VERBOSE:-"0"}
|
||||||
readonly QUIET=${QUIET:-"0"}
|
readonly QUIET=${QUIET:-"0"}
|
||||||
|
|
||||||
readonly VERSION="20.06.1"
|
readonly VERSION="20.08"
|
||||||
|
|
||||||
readonly SRV_IP=${SRV_IP:-""}
|
readonly SRV_IP=${SRV_IP:-""}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue