pass altname/domain as second argument to HOOK

This commit is contained in:
Simon Ruderich
2015-12-08 15:16:05 +01:00
parent 7f8ea450ff
commit e32ea24c78
2 changed files with 8 additions and 7 deletions

View File

@@ -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>

View File

@@ -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