From ab30195142165f03fd8b996d6c93d5918b137514 Mon Sep 17 00:00:00 2001 From: ET Date: Tue, 8 Dec 2015 18:09:46 +0100 Subject: [PATCH] Move cleaning challenge in order to clean when challenge is valid and when challenge is invalid. --- letsencrypt.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/letsencrypt.sh b/letsencrypt.sh index 526ce9a..00b87e5 100755 --- a/letsencrypt.sh +++ b/letsencrypt.sh @@ -251,17 +251,16 @@ sign_domain() { done rm -f "${WELLKNOWN}/${challenge_token}" - + + # Wait for hook script to clean the challenge if used + if [[ -n "${HOOK}" ]] && [[ -n "${challenge_token}" ]]; then + ${HOOK} "clean_challenge" "${altname}" "${challenge_token}" "${keyauth}" + fi + if [[ "${status}" = "valid" ]]; then echo " + Challenge is valid!" else echo " + Challenge is invalid! (returned: ${status})" - - # Wait for hook script to clean the challenge if used - if [[ -n "${HOOK}" ]] && [[ -n "${challenge_token}" ]]; then - ${HOOK} "clean_challenge" "${altname}" "${challenge_token}" "${keyauth}" - fi - exit 1 fi -- 2.39.5