From 65ccc2c0b5677a9b778be225a4a4b64bb2d0725a Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Thu, 12 Oct 2017 18:22:06 +0200 Subject: [PATCH] evoacme: use env variables for execution modes --- evoacme/files/evoacme.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/evoacme/files/evoacme.sh b/evoacme/files/evoacme.sh index a72408ab..f9b99c97 100755 --- a/evoacme/files/evoacme.sh +++ b/evoacme/files/evoacme.sh @@ -11,16 +11,20 @@ set -e set -u usage() { - echo "Usage: $0 [ --cron ] NAME" + echo "Usage: $0 NAME" echo "" echo "NAME must be correspond to :" echo "- a CSR in ${CSR_DIR}/NAME.csr" echo "- a KEY in ${SSL_KEY_DIR}/NAME.key" echo "" + echo "If env variable TEST=1, certbot is run in staging mode" + echo "If env variable DRY_RUN=1, certbot is run in dry-run mode" + echo "If env variable CRON=1, no message is output" + echo "" } debug() { - [ "$CRON" = "NO" ] && echo "$1" + [ "${CRON}" = "0" ] && echo "$1" } error() { @@ -70,6 +74,10 @@ main() { [ -z "${SELF_SIGNED_DIR}" ] && SELF_SIGNED_DIR=/etc/ssl/self-signed [ -z "${DH_DIR}" ] && DH_DIR=etc/ssl/dhparam + CRON=${CRON:-"0"} + TEST=${TEST:-"0"} + DRY_RUN=${DRY_RUN:-"0"} + [ "$1" = "-h" ] || [ "$1" = "--help" ] && usage && exit 0 # check arguments [ "$#" -ge 3 ] || [ "$#" -le 0 ] && error "invalid argument(s)" @@ -161,9 +169,9 @@ main() { NEW_CHAIN="${NEW_DIR}/chain.pem" CERTBOT_MODE="" - [ "$TEST" = "YES" ] && CERTBOT_MODE="${CERTBOT_MODE} --test-cert" - [ "$CRON" = "YES" ] && CERTBOT_MODE="${CERTBOT_MODE} --quiet" - [ "$DRY_RUN" = "YES" ] && CERTBOT_MODE="${CERTBOT_MODE} --dry-run" + [ "${TEST}" = "1" ] && CERTBOT_MODE="${CERTBOT_MODE} --test-cert" + [ "${CRON}" = "1" ] && CERTBOT_MODE="${CERTBOT_MODE} --quiet" + [ "${DRY_RUN}" = "1" ] && CERTBOT_MODE="${CERTBOT_MODE} --dry-run" CERTBOT_REGISTRATION="--agree-tos" if [ -n "${SSL_EMAIL}" ]; then