1 diff -ur dehydrated-0.4.0.orig/dehydrated dehydrated-0.4.0/dehydrated
2 --- dehydrated-0.4.0.orig/dehydrated 2017-02-05 14:33:17.000000000 +0000
3 +++ dehydrated-0.4.0/dehydrated 2017-10-24 00:24:53.662801025 +0000
8 # dehydrated by lukas2511
9 # Source: https://github.com/lukas2511/dehydrated
12 # Check for config in various locations
13 if [[ -z "${CONFIG:-}" ]]; then
14 - for check_config in "/etc/dehydrated" "/usr/local/etc/dehydrated" "${PWD}" "${SCRIPTDIR}"; do
15 + for check_config in "/etc/dehydrated" "/etc/webapps/dehydrated" "/usr/local/etc/dehydrated" "/etc/webapps/letsencrypt.sh" "${PWD}" "${SCRIPTDIR}"; do
16 if [[ -f "${check_config}/config" ]]; then
17 BASEDIR="${check_config}"
18 CONFIG="${check_config}/config"
27 PRIVATE_KEY_RENEW="yes"
29 [[ -d "${BASEDIR}" ]] || _exiterr "BASEDIR does not exist: ${BASEDIR}"
31 CAHASH="$(echo "${CA}" | urlbase64)"
32 - [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="${BASEDIR}/accounts"
33 + [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="/var/lib/dehydrated/accounts"
34 mkdir -p "${ACCOUNTDIR}/${CAHASH}"
35 [[ -f "${ACCOUNTDIR}/${CAHASH}/config" ]] && . "${ACCOUNTDIR}/${CAHASH}/config"
36 ACCOUNT_KEY="${ACCOUNTDIR}/${CAHASH}/account_key.pem"
38 mv "${BASEDIR}/private_key.json" "${ACCOUNT_KEY_JSON}"
41 - [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs"
42 - [[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="${BASEDIR}/domains.txt"
43 - [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/www/dehydrated"
44 + [[ -z "${CERTDIR}" ]] && CERTDIR="/var/lib/dehydrated/certs"
45 + [[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="/etc/webapps/dehydrated/domains.txt"
46 + [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/lib/dehydrated/acme-challenges"
47 [[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock"
48 [[ -n "${PARAM_LOCKFILE_SUFFIX:-}" ]] && LOCKFILE="${LOCKFILE}-${PARAM_LOCKFILE_SUFFIX}"
49 [[ -n "${PARAM_NO_LOCK:-}" ]] && LOCKFILE=""
50 diff -ur dehydrated-0.4.0.orig/docs/examples/config dehydrated-0.4.0/docs/examples/config
51 --- dehydrated-0.4.0.orig/docs/examples/config 2017-02-05 14:33:17.000000000 +0000
52 +++ dehydrated-0.4.0/docs/examples/config 2017-10-24 00:23:06.163807433 +0000
54 # Path to certificate authority license terms redirect (default: https://acme-v01.api.letsencrypt.org/terms)
55 #CA_TERMS="https://acme-v01.api.letsencrypt.org/terms"
58 # Path to license agreement (default: <unset>)
64 # File containing the list of domains to request certificates for (default: $BASEDIR/domains.txt)
65 -#DOMAINS_TXT="${BASEDIR}/domains.txt"
66 +#DOMAINS_TXT="/etc/webapps/dehydrated/domains.txt"
68 # Output directory for generated certificates
69 -#CERTDIR="${BASEDIR}/certs"
70 +#CERTDIR="/var/lib/dehydrated/certs"
72 # Directory for account keys and registration information
73 -#ACCOUNTDIR="${BASEDIR}/accounts"
74 +#ACCOUNTDIR="/var/lib/dehydrated/accounts"
76 # Output directory for challenge-tokens to be served by webserver or deployed in HOOK (default: /var/www/dehydrated)
77 -#WELLKNOWN="/var/www/dehydrated"
78 +#WELLKNOWN="/var/lib/dehydrated/acme-challenges"
80 # Default keysize for private keys (default: 4096)
84 # BASEDIR and WELLKNOWN variables are exported and can be used in an external program
87 +#HOOK=/etc/webapps/dehydrated/hook.sh
89 # Chain clean_challenge|deploy_challenge arguments together into one hook call per certificate (default: no)
92 -# Minimum days before expiration to automatically renew certificate (default: 30)
94 +# Minimum days before expiration to automatically renew certificate (default: 10)
97 # Regenerate private keys instead of just signing new certificates on renewal (default: yes)
98 #PRIVATE_KEY_RENEW="yes"