--- dehydrated-0.3.1/dehydrated 2016-11-22 19:57:26.978516490 +0200 +++ dehydrated-0.3.1/dehydrated 2016-11-22 20:01:59.118747292 +0200 @@ -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" "/etc/webapps/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" @@ -224,7 +224,7 @@ load_config() { # Create new account directory or symlink to account directory from old CA CAHASH="$(echo "${CA}" | urlbase64)" - [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="${BASEDIR}/accounts" + [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="/var/lib/dehydrated//accounts" if [[ ! -e "${ACCOUNTDIR}/${CAHASH}" ]]; then OLDCAHASH="$(echo "${OLDCA}" | urlbase64)" mkdir -p "${ACCOUNTDIR}" @@ -249,10 +249,10 @@ load_config() { mv "${BASEDIR}/private_key.json" "${ACCOUNT_KEY_JSON}" fi - [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs" + [[ -z "${CERTDIR}" ]] && CERTDIR="/var/lib/dehydrated//certs" [[ -z "${CHAINCACHE}" ]] && CHAINCACHE="${BASEDIR}/chains" [[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="${BASEDIR}/domains.txt" - [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/www/dehydrated" + [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/lib/dehydrated/acme-challenge" [[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock" [[ -z "${OPENSSL_CNF}" ]] && OPENSSL_CNF="$("${OPENSSL}" version -d | cut -d\" -f2)/openssl.cnf" [[ -n "${PARAM_LOCKFILE_SUFFIX:-}" ]] && LOCKFILE="${LOCKFILE}-${PARAM_LOCKFILE_SUFFIX}" --- dehydrated-0.3.1/docs/examples/config 2016-10-17 22:32:37.370663315 +0300 +++ dehydrated-0.3.1/docs/examples/config 2016-11-22 20:02:34.173827857 +0200 @@ -37,13 +37,13 @@ #DOMAINS_TXT="${BASEDIR}/domains.txt" # Output directory for generated certificates -#CERTDIR="${BASEDIR}/certs" +#CERTDIR="/var/lib/dehydrated/certs" # Directory for account keys and registration information #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/acme-challenge" # 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"