scan /etc/webapps/dehydrated for config

[packages/dehydrated.git] / pld.patch

diff --git a/pld.patch b/pld.patch
index d9513efccde6646287379697d10c0908b8e1e363..d9a90f16f742870a566ddc89bdc98b84e38c5d54 100644 (file)
--- a/pld.patch
+++ b/pld.patch
@@ -1,5 +1,5 @@
---- 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
+--- 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
@@ -11,16 +11,55 @@
    # 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
++    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"
-@@ -181,7 +181,7 @@
+@@ -164,7 +164,7 @@
+   [[ -d "${BASEDIR}" ]] || _exiterr "BASEDIR does not exist: ${BASEDIR}"
  
-   [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs"
+   CAHASH="$(echo "${CA}" | urlbase64)"
+-  [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="${BASEDIR}/accounts"
++  [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="/var/lib/dehydrated/accounts"
+   mkdir -p "${ACCOUNTDIR}/${CAHASH}"
+   [[ -f "${ACCOUNTDIR}/${CAHASH}/config" ]] && . "${ACCOUNTDIR}/${CAHASH}/config"
+   ACCOUNT_KEY="${ACCOUNTDIR}/${CAHASH}/account_key.pem"
+@@ -179,9 +179,9 @@
+     mv "${BASEDIR}/private_key.json" "${ACCOUNT_KEY_JSON}"
+   fi
+ 
+-  [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs"
++  [[ -z "${CERTDIR}" ]] && CERTDIR="/var/lib/dehydrated/certs"
    [[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="${BASEDIR}/domains.txt"
 -  [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/www/dehydrated"
-+  [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/lib/dehydrated"
++  [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/lib/dehydrated/acme-challenge"
    [[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock"
    [[ -n "${PARAM_NO_LOCK:-}" ]] && LOCKFILE=""
  
+--- 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: <unset>
+-#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"