pld.patch

   1 --- dehydrated-0.3.1/dehydrated 2016-05-14 15:51:55.000000000 +0300
   2 +++ dehydrated-0.3.1/dehydrated 2016-10-17 22:03:54.184281322 +0300
   3 @@ -1,4 +1,4 @@
   4 -#!/usr/bin/env bash
   5 +#!/bin/bash
   6
   7  # letsencrypt.sh by lukas2511
   8  # Source: https://github.com/lukas2511/letsencrypt.sh
   9 @@ -94,7 +94,7 @@
  10  load_config() {
  11    # Check for config in various locations
  12    if [[ -z "${CONFIG:-}" ]]; then
  13 -    for check_config in "/etc/dehydrated" "/usr/local/etc/dehydrated" "${PWD}" "${SCRIPTDIR}"; do
  14 +    for check_config in "/etc/dehydrated" "/usr/local/etc/dehydrated" "/etc/webapps/letsencrypt.sh" "${PWD}" "${SCRIPTDIR}"; do
  15        if [[ -f "${check_config}/config" ]]; then
  16          BASEDIR="${check_config}"
  17          CONFIG="${check_config}/config"
  18 @@ -181,7 +181,7 @@
  19
  20    [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs"
  21    [[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="${BASEDIR}/domains.txt"
  22 -  [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/www/dehydrated"
  23 +  [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/lib/dehydrated"
  24    [[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock"
  25    [[ -n "${PARAM_NO_LOCK:-}" ]] && LOCKFILE=""
  26
  27 --- dehydrated-0.3.1/docs/examples/config~      2016-09-13 21:00:43.000000000 +0300
  28 +++ dehydrated-0.3.1/docs/examples/config       2016-10-17 22:32:37.370663315 +0300
  29 @@ -43,7 +43,7 @@
  30  #ACCOUNTDIR="${BASEDIR}/accounts"
  31
  32  # Output directory for challenge-tokens to be served by webserver or deployed in HOOK (default: /var/www/dehydrated)
  33 -#WELLKNOWN="/var/www/dehydrated"
  34 +#WELLKNOWN="/var/lib/dehydrated"
  35
  36  # Default keysize for private keys (default: 4096)
  37  #KEYSIZE="4096"
  38 @@ -61,7 +61,7 @@
  39  #
  40  # BASEDIR and WELLKNOWN variables are exported and can be used in an external program
  41  # default: <unset>
  42 -#HOOK=
  43 +HOOK=/etc/webapps/dehydrated/hook.sh
  44
  45  # Chain clean_challenge|deploy_challenge arguments together into one hook call per certificate (default: no)
  46  #HOOK_CHAIN="no"