Move cleaning challenge in order to clean when challenge is valid and when challenge...

diff --git a/letsencrypt.sh b/letsencrypt.sh
index 526ce9a824e53baf5979187c07824cf9961043b4..00b87e52a792504e04848861907b0854a78efa69 100755 (executable)
--- 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