starred/dehydrated
1
0
Fork 0
mirror of https://github.com/dehydrated-io/dehydrated.git synced 2026-04-23 16:58:28 +02:00
Code Issues 79 Packages Projects Releases 10 Wiki Activity

Introduce per cert configuration directory DOMAINS_D (#242)

Browse Source
This commit is contained in:
Martin Schut
2016-07-13 13:23:15 +02:00
committed by Lukas Schauer
parent 2042b177c7
commit 44aca90cd7
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
letsencrypt.sh
View File

@@ -105,6 +105,7 @@ load_config() {
ACCOUNTDIR= ACCOUNTDIR=
CHALLENGETYPE="http-01" CHALLENGETYPE="http-01"
CONFIG_D= CONFIG_D=
DOMAINS_D=
DOMAINS_TXT= DOMAINS_TXT=
HOOK= HOOK=
HOOK_CHAIN="no" HOOK_CHAIN="no"
@@ -664,7 +665,13 @@ command_sign_domains() {
# for now this loads the certificate specific config in a subshell and parses a diff of set variables. # for now this loads the certificate specific config in a subshell and parses a diff of set variables.
# we could just source the config file but i decided to go this way to protect people from accidentally overriding # we could just source the config file but i decided to go this way to protect people from accidentally overriding
# variables used internally by this script itself. # variables used internally by this script itself.
if [ -f "${CERTDIR}/${domain}/config" ]; then if [[ -n "${DOMAINS_D}" ]]; then
certconfig="${DOMAINS_D}/${domain}"
else
certconfig="${CERTDIR}/${domain}/config"
fi
if [ -f "${certconfig}" ]; then
echo " + Using certificate specific config file!" echo " + Using certificate specific config file!"
ORIGIFS="${IFS}" ORIGIFS="${IFS}"
IFS=$'\n' IFS=$'\n'
@@ -673,7 +680,7 @@ command_sign_domains() {
aftervars="$(_mktemp)" aftervars="$(_mktemp)"
set > "${beforevars}" set > "${beforevars}"
# shellcheck disable=SC1090 # shellcheck disable=SC1090
. "${CERTDIR}/${domain}/config" . "${certconfig}"
set > "${aftervars}" set > "${aftervars}"
diff -u "${beforevars}" "${aftervars}" | grep -E '^\+[^+]' diff -u "${beforevars}" "${aftervars}" | grep -E '^\+[^+]'
rm "${beforevars}" rm "${beforevars}"
@@ -893,7 +900,7 @@ command_help() {
command_env() { command_env() {
echo "# letsencrypt.sh configuration" echo "# letsencrypt.sh configuration"
load_config load_config
typeset -p CA LICENSE CERTDIR CHALLENGETYPE DOMAINS_TXT HOOK HOOK_CHAIN RENEW_DAYS ACCOUNT_KEY ACCOUNT_KEY_JSON KEYSIZE WELLKNOWN PRIVATE_KEY_RENEW OPENSSL_CNF CONTACT_EMAIL LOCKFILE typeset -p CA LICENSE CERTDIR CHALLENGETYPE DOMAINS_D DOMAINS_TXT HOOK HOOK_CHAIN RENEW_DAYS ACCOUNT_KEY ACCOUNT_KEY_JSON KEYSIZE WELLKNOWN PRIVATE_KEY_RENEW OPENSSL_CNF CONTACT_EMAIL LOCKFILE
} }
# Main method (parses script arguments and calls command_* methods) # Main method (parses script arguments and calls command_* methods)