From: ET <et@corde.org>
Date: Tue, 8 Dec 2015 17:09:46 +0000 (+0100)
Subject: Move cleaning challenge in order to clean when challenge is valid and when challenge... 
X-Git-Tag: v0.1.0~146^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F33%2Fhead;p=thirdparty%2Fdehydrated.git

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

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