From 1b50dfb0b36fc96299c4b61a85230ae33048e572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lecour?= <jlecour@evolix.fr>
Date: Thu, 19 Oct 2017 23:23:51 +0200
Subject: [PATCH] evoacme: inline hooks calls + export variables

---
 evoacme/files/evoacme.sh | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/evoacme/files/evoacme.sh b/evoacme/files/evoacme.sh
index d4c3406d..b7e5f68c 100755
--- a/evoacme/files/evoacme.sh
+++ b/evoacme/files/evoacme.sh
@@ -92,20 +92,6 @@ csr_verify() {
     "${OPENSSL_BIN}" req -noout -modulus -in "$file" >/dev/null
 }
 
-exec_hooks() {
-    local hooks_dir="$1"
-
-    export EVOACME_VHOST_NAME="${VHOST}"
-    export EVOACME_LIVE_FULLCHAIN="${LIVE_FULLCHAIN}"
-
-    for hook in $(find ${hooks_dir} -type f | grep -v ".disabled$"); do
-        if [ -x "${hook}" ]; then
-            debug "Executing ${hook}"
-            ${hook}
-        fi
-    done
-}
-
 main() {
     # check arguments
     [ "$#" -eq 1 ] || error "invalid argument(s)"
@@ -262,7 +248,22 @@ main() {
     # update Nginx
     sed_cert_path_for_nginx "${VHOST}" "${LIVE_FULLCHAIN}"
 
-    exec_hooks "${HOOKS_DIR}"
+    #### EXECUTE HOOKS
+    #
+    # executable scripts placed in ${HOOKS_DIR}
+    # are executed, unless their name ends with ".disabled"
+
+    export EVOACME_VHOST_NAME="${VHOST}"
+    export EVOACME_CERT="${LIVE_CERT}"
+    export EVOACME_CHAIN="${LIVE_CHAIN}"
+    export EVOACME_FULLCHAIN="${LIVE_FULLCHAIN}"
+
+    for hook in $(find ${HOOKS_DIR} -type f | grep -v ".disabled$"); do
+        if [ -x "${hook}" ]; then
+            debug "Executing ${hook}"
+            ${hook}
+        fi
+    done
 }
 
 readonly PROGNAME=$(basename "$0")