mirror of
https://github.com/dehydrated-io/dehydrated.git
synced 2026-02-24 03:14:48 +01:00
Merge pull request #157 from lschuermann/master
Add hook for unchanged certificates.
This commit is contained in:
@@ -52,4 +52,24 @@ function deploy_cert {
|
||||
# The path of the file containing the intermediate certificate(s).
|
||||
}
|
||||
|
||||
function unchanged_cert {
|
||||
local DOMAIN="${1}" KEYFILE="${2}" CERTFILE="${3}" FULLCHAINFILE="${4}" CHAINFILE="${5}"
|
||||
|
||||
# This hook is called once for each certificate that is still
|
||||
# valid and therefore wasn't reissued.
|
||||
#
|
||||
# Parameters:
|
||||
# - DOMAIN
|
||||
# The primary domain name, i.e. the certificate common
|
||||
# name (CN).
|
||||
# - KEYFILE
|
||||
# The path of the file containing the private key.
|
||||
# - CERTFILE
|
||||
# The path of the file containing the signed certificate.
|
||||
# - FULLCHAINFILE
|
||||
# The path of the file containing the full certificate chain.
|
||||
# - CHAINFILE
|
||||
# The path of the file containing the intermediate certificate(s).
|
||||
}
|
||||
|
||||
HANDLER=$1; shift; $HANDLER $@
|
||||
|
||||
@@ -595,7 +595,9 @@ command_sign_domains() {
|
||||
if [[ "${force_renew}" = "yes" ]]; then
|
||||
echo "Ignoring because renew was forced!"
|
||||
else
|
||||
echo "Skipping!"
|
||||
# Certificate-Names unchanged and cert is still valid
|
||||
echo "Skipping renew!"
|
||||
[[ -n "${HOOK}" ]] && "${HOOK}" "unchanged_cert" "${domain}" "${BASEDIR}/certs/${domain}/privkey.pem" "${BASEDIR}/certs/${domain}/cert.pem" "${BASEDIR}/certs/${domain}/fullchain.pem" "${BASEDIR}/certs/${domain}/chain.pem"
|
||||
continue
|
||||
fi
|
||||
else
|
||||
|
||||
2
test.sh
2
test.sh
@@ -153,7 +153,7 @@ _TEST "Run in cron mode again, this time with domain in domains.txt, should find
|
||||
echo "${TMP_URL} ${TMP2_URL} ${TMP3_URL}" >> domains.txt
|
||||
./letsencrypt.sh --cron > tmplog 2> errorlog || _FAIL "Script execution failed"
|
||||
_CHECK_LOG "Checking domain name(s) of existing cert... unchanged."
|
||||
_CHECK_LOG "Skipping!"
|
||||
_CHECK_LOG "Skipping renew"
|
||||
_CHECK_ERRORLOG
|
||||
|
||||
# Run in cron mode one last time, with domain in domains.txt and force-resign (should find certificate, resign anyway, and not generate private key)
|
||||
|
||||
Reference in New Issue
Block a user