From: Simon Ruderich <simon@ruderich.org>
Date: Tue, 8 Dec 2015 14:16:05 +0000 (+0100)
Subject: pass altname/domain as second argument to HOOK
X-Git-Tag: v0.1.0~157
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e32ea24c783a3ac0d07d7fa04a4e12da9981518d;p=thirdparty%2Fdehydrated.git

pass altname/domain as second argument to HOOK
---

diff --git a/config.sh.example b/config.sh.example
index f61b430..de48b42 100644
--- a/config.sh.example
+++ b/config.sh.example
@@ -33,11 +33,12 @@
 
 # Program or function called in certain situations
 #
-# After generating the challenge-response, or after failed challenge
-# Given arguments: clean_challenge|deploy_challenge token-filename token-content
+# After generating the challenge-response, or after failed challenge (in this
+# case altname is empty)
+# Given arguments: clean_challenge|deploy_challenge altname token-filename token-content
 #
 # After successfully signing certificate
-# Given arguments: deploy_cert path/to/privkey.pem path/to/cert.pem path/to/fullchain.pem
+# Given arguments: deploy_cert domain path/to/privkey.pem path/to/cert.pem path/to/fullchain.pem
 #
 # BASEDIR and WELLKNOWN variables are exported and can be used in an external program
 # default: <unset>
diff --git a/letsencrypt.sh b/letsencrypt.sh
index e7f2b94..f495cb1 100755
--- a/letsencrypt.sh
+++ b/letsencrypt.sh
@@ -101,7 +101,7 @@ _request() {
 
     # Wait for hook script to clean the challenge if used
     if [[ -n "${HOOK}" ]]; then
-      ${HOOK} "clean_challenge" "${challenge_token}" "${keyauth}" 
+      ${HOOK} "clean_challenge" '' "${challenge_token}" "${keyauth}"
     fi
 
     exit 1
@@ -220,7 +220,7 @@ sign_domain() {
 
     # Wait for hook script to deploy the challenge if used
     if [[ -n "${HOOK}" ]]; then
-        ${HOOK} "deploy_challenge" "${challenge_token}" "${keyauth}"
+        ${HOOK} "deploy_challenge" "${altname}" "${challenge_token}" "${keyauth}"
     fi
 
     # Ask the acme-server to verify our challenge and wait until it becomes valid
@@ -244,7 +244,7 @@ sign_domain() {
 
       # Wait for hook script to clean the challenge if used
       if [[ -n "${HOOK}" ]] && [[ -n "${challenge_token}" ]]; then
-        ${HOOK} "clean_challenge" "${challenge_token}" "${keyauth}" 
+        ${HOOK} "clean_challenge" "${altname}" "${challenge_token}" "${keyauth}"
       fi
 
       exit 1
@@ -280,7 +280,7 @@ sign_domain() {
 
   # Wait for hook script to clean the challenge and to deploy cert if used
   if [[ -n "${HOOK}" ]]; then
-      ${HOOK} "deploy_cert" "${BASEDIR}/certs/${domain}/privkey.pem" "${BASEDIR}/certs/${domain}/cert.pem" "${BASEDIR}/certs/${domain}/fullchain.pem" 
+      ${HOOK} "deploy_cert" "${domain}" "${BASEDIR}/certs/${domain}/privkey.pem" "${BASEDIR}/certs/${domain}/cert.pem" "${BASEDIR}/certs/${domain}/fullchain.pem"
   fi
 
   unset challenge_token