diff -ur dehydrated-0.4.0.orig/dehydrated dehydrated-0.4.0/dehydrated --- dehydrated-0.4.0.orig/dehydrated 2017-02-05 15:33:17.000000000 +0100 +++ dehydrated-0.4.0/dehydrated 2017-10-24 16:58:33.761256185 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # dehydrated by lukas2511 # Source: https://github.com/lukas2511/dehydrated @@ -20,7 +20,7 @@ done SCRIPTDIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" -BASEDIR="${SCRIPTDIR}" +BASEDIR="/var/lib/dehydrated" # Create (identifiable) temporary files _mktemp() { @@ -115,7 +115,7 @@ DOMAINS_TXT= HOOK= HOOK_CHAIN="no" - RENEW_DAYS="30" + RENEW_DAYS="10" KEYSIZE="4096" WELLKNOWN= PRIVATE_KEY_RENEW="yes" @@ -182,8 +182,8 @@ fi [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs" - [[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="${BASEDIR}/domains.txt" - [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/www/dehydrated" + [[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="/etc/dehydrated/domains.txt" + [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="${BASEDIR}/acme-challenges" [[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock" [[ -n "${PARAM_LOCKFILE_SUFFIX:-}" ]] && LOCKFILE="${LOCKFILE}-${PARAM_LOCKFILE_SUFFIX}" [[ -n "${PARAM_NO_LOCK:-}" ]] && LOCKFILE="" diff -ur dehydrated-0.4.0.orig/docs/examples/config dehydrated-0.4.0/docs/examples/config --- dehydrated-0.4.0.orig/docs/examples/config 2017-02-05 15:33:17.000000000 +0100 +++ dehydrated-0.4.0/docs/examples/config 2017-10-24 16:58:47.821256753 +0200 @@ -33,11 +33,11 @@ # default: #CONFIG_D= -# Base directory for account key, generated certificates and list of domains (default: $SCRIPTDIR -- uses config directory if undefined) -#BASEDIR=$SCRIPTDIR +# Base directory for account key, generated certificates and list of domains (default: /var/lib/dehydrated) +#BASEDIR="/var/lib/dehydrated" # File containing the list of domains to request certificates for (default: $BASEDIR/domains.txt) -#DOMAINS_TXT="${BASEDIR}/domains.txt" +#DOMAINS_TXT="/etc/dehydrated/domains.txt" # Output directory for generated certificates #CERTDIR="${BASEDIR}/certs" @@ -46,7 +46,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="${BASEDIR}/acme-challenges" # Default keysize for private keys (default: 4096) #KEYSIZE="4096" @@ -64,13 +64,13 @@ # # BASEDIR and WELLKNOWN variables are exported and can be used in an external program # default: -#HOOK= +#HOOK="/etc/dehydrated/hooks/hook.sh" # Chain clean_challenge|deploy_challenge arguments together into one hook call per certificate (default: no) #HOOK_CHAIN="no" -# Minimum days before expiration to automatically renew certificate (default: 30) -#RENEW_DAYS="30" +# Minimum days before expiration to automatically renew certificate (default: 10) +#RENEW_DAYS="10" # Regenerate private keys instead of just signing new certificates on renewal (default: yes) #PRIVATE_KEY_RENEW="yes"