added `exit_hook` hook

diff --git a/CHANGELOG b/CHANGELOG
index 8516599990ea8ce1e82445c572c5f93f6fcaec7c..fbc5cf1bcb5a56fae2d707de20c0624b0cfe1b1f 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@ This file contains a log of major changes in dehydrated
 - Added `--lock-suffix` option for allowing parallel execution
 - Added `invalid_challenge` hook
 - Added `request_failure` hook
+- Added `exit_hook` hook
 
 ## [0.3.1] - 2016-09-13
 ## Changed

diff --git a/dehydrated b/dehydrated
index 9f6e7784a7bd2f68210bbe97ee0c88d4dd44ccc8..9e8a98d051256fdcb53ee9a3fcabf5a45fdb11ad 100755 (executable)
--- a/dehydrated
+++ b/dehydrated
@@ -221,7 +221,7 @@ init_system() {
   _exiterr "Problem retrieving ACME/CA-URLs, check if your configured CA points to the directory entrypoint."
 
   # Export some environment variables to be used in hook script
-  export WELLKNOWN BASEDIR CERTDIR CONFIG
+  export WELLKNOWN BASEDIR CERTDIR CONFIG COMMAND
 
   # Checking for private key ...
   register_new_key="no"
@@ -822,6 +822,7 @@ command_sign_domains() {
   # remove temporary domains.txt file if used
   [[ -n "${PARAM_DOMAIN:-}" ]] && rm -f "${DOMAINS_TXT}"
 
+  [[ -n "${HOOK}" ]] && "${HOOK}" "exit_hook"
   exit 0
 }
 

diff --git a/docs/examples/hook.sh b/docs/examples/hook.sh
index 3f2a5867a24816b5ebaa6071e3181a1d185bc04c..7107580bce849b68fba7b8df0de7cec797c8af96 100755 (executable)
--- a/docs/examples/hook.sh
+++ b/docs/examples/hook.sh
@@ -89,7 +89,7 @@ invalid_challenge() {
 }
 
 request_failure() {
-    local STATUSCODE="${1}" REASON="${2}" REQTYPE=${3}
+    local STATUSCODE="${1}" REASON="${2}" REQTYPE="${3}"
 
     # This hook is called when a HTTP request fails (e.g., when the ACME
     # server is busy, returns an error, etc). It will be called upon any
@@ -105,5 +105,12 @@ request_failure() {
     #   The kind of request that was made (GET, POST...)
 }
 
+exit_hook() {
+  # This hook is called at the end of a dehydrated command and can be used
+  # to do some final (cleanup or other) tasks.
+
+  :
+}
+
 HANDLER="$1"; shift
 "$HANDLER" "$@"