diff -ur dehydrated-0.6.2.orig/dehydrated dehydrated-0.6.2/dehydrated --- dehydrated-0.6.2.orig/dehydrated 2018-04-25 21:22:40.000000000 +0000 +++ dehydrated-0.6.2/dehydrated 2018-05-27 19:22:45.065763589 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # dehydrated by lukas2511 # Source: https://dehydrated.io @@ -28,7 +28,7 @@ done SCRIPTDIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" -BASEDIR="${SCRIPTDIR}" +BASEDIR="/var/lib/dehydrated" ORIGARGS="$@" # Create (identifiable) temporary files @@ -133,7 +133,7 @@ DOMAINS_TXT= HOOK= HOOK_CHAIN="no" - RENEW_DAYS="30" + RENEW_DAYS="10" KEYSIZE="4096" WELLKNOWN= PRIVATE_KEY_RENEW="yes" @@ -255,8 +255,8 @@ [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs" [[ -z "${CHAINCACHE}" ]] && CHAINCACHE="${BASEDIR}/chains" - [[ -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" [[ -z "${OPENSSL_CNF}" ]] && OPENSSL_CNF="$("${OPENSSL}" version -d | cut -d\" -f2)/openssl.cnf" [[ -n "${PARAM_LOCKFILE_SUFFIX:-}" ]] && LOCKFILE="${LOCKFILE}-${PARAM_LOCKFILE_SUFFIX}" diff -ur dehydrated-0.6.2.orig/docs/examples/config dehydrated-0.6.2/docs/examples/config --- dehydrated-0.6.2.orig/docs/examples/config 2018-04-25 21:22:40.000000000 +0000 +++ dehydrated-0.6.2/docs/examples/config 2018-05-27 19:12:46.943770323 +0000 @@ -40,11 +40,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" @@ -53,7 +53,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" @@ -77,13 +77,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"