]> git.ipfire.org Git - thirdparty/dehydrated.git/commitdiff
also run request_failure and invalid_challenge when HOOK_CHAIN is defined (fixes...
authorLukas Schauer <lukas@schauer.so>
Sun, 8 Apr 2018 20:16:54 +0000 (22:16 +0200)
committerLukas Schauer <lukas@schauer.so>
Sun, 8 Apr 2018 20:18:30 +0000 (22:18 +0200)
dehydrated

index 29754606a6114a1d61c49198e4f834f85dc8d512..c28418bf1ebde2dc14c9ed005b1b2c14443b54a5 100755 (executable)
@@ -544,7 +544,7 @@ http_request() {
       echo >&2
 
       # An exclusive hook for the {1}-request error might be useful (e.g., for sending an e-mail to admins)
-      if [[ -n "${HOOK}" ]] && [[ "${HOOK_CHAIN}" != "yes" ]]; then
+      if [[ -n "${HOOK}" ]]; then
         errtxt="$(cat ${tempcont})"
         errheaders="$(cat ${tempheaders})"
         "${HOOK}" "request_failure" "${statuscode}" "${errtxt}" "${1}" "${errheaders}"
@@ -799,7 +799,7 @@ sign_csr() {
     if [[ "${reqstatus}" = "valid" ]]; then
       echo " + Challenge is valid!"
     else
-      [[ -n "${HOOK}" ]] && [[ "${HOOK_CHAIN}" != "yes" ]] && "${HOOK}" "invalid_challenge" "${altname}" "${result}"
+      [[ -n "${HOOK}" ]] && "${HOOK}" "invalid_challenge" "${altname}" "${result}"
       break
     fi
     idx=$((idx+1))