--- dehydrated-0.3.1/dehydrated 2016-05-14 15:51:55.000000000 +0300 +++ dehydrated-0.3.1/dehydrated 2016-10-17 22:03:54.184281322 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # letsencrypt.sh by lukas2511 # Source: https://github.com/lukas2511/letsencrypt.sh @@ -94,7 +94,7 @@ load_config() { # Check for config in various locations if [[ -z "${CONFIG:-}" ]]; then - for check_config in "/etc/dehydrated" "/usr/local/etc/dehydrated" "${PWD}" "${SCRIPTDIR}"; do + for check_config in "/etc/dehydrated" "/usr/local/etc/dehydrated" "/etc/webapps/letsencrypt.sh" "${PWD}" "${SCRIPTDIR}"; do if [[ -f "${check_config}/config" ]]; then BASEDIR="${check_config}" CONFIG="${check_config}/config" @@ -181,7 +181,7 @@ [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs" [[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="${BASEDIR}/domains.txt" - [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/www/dehydrated" + [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/lib/dehydrated" [[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock" [[ -n "${PARAM_NO_LOCK:-}" ]] && LOCKFILE="" --- dehydrated-0.3.1/docs/examples/config~ 2016-09-13 21:00:43.000000000 +0300 +++ dehydrated-0.3.1/docs/examples/config 2016-10-17 22:32:37.370663315 +0300 @@ -43,7 +43,7 @@ #ACCOUNTDIR="${BASEDIR}/accounts" # Output directory for challenge-tokens to be served by webserver or deployed in HOOK (default: /var/www/dehydrated) -#WELLKNOWN="/var/www/dehydrated" +#WELLKNOWN="/var/lib/dehydrated" # Default keysize for private keys (default: 4096) #KEYSIZE="4096" @@ -61,7 +61,7 @@ # # BASEDIR and WELLKNOWN variables are exported and can be used in an external program # default: -#HOOK= +HOOK=/etc/webapps/dehydrated/hook.sh # Chain clean_challenge|deploy_challenge arguments together into one hook call per certificate (default: no) #HOOK_CHAIN="no"