pld.patch

   1 --- dehydrated-0.3.1/dehydrated 2016-11-22 19:57:26.978516490 +0200
   2 +++ dehydrated-0.3.1/dehydrated 2016-11-22 20:01:59.118747292 +0200
   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" "/etc/webapps/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 @@ -224,7 +224,7 @@ load_config() {
  19
  20    # Create new account directory or symlink to account directory from old CA
  21    CAHASH="$(echo "${CA}" | urlbase64)"
  22 -  [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="${BASEDIR}/accounts"
  23 +  [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="/var/lib/dehydrated//accounts"
  24    if [[ ! -e "${ACCOUNTDIR}/${CAHASH}" ]]; then
  25      OLDCAHASH="$(echo "${OLDCA}" | urlbase64)"
  26      mkdir -p "${ACCOUNTDIR}"
  27 @@ -249,10 +249,10 @@ load_config() {
  28      mv "${BASEDIR}/private_key.json" "${ACCOUNT_KEY_JSON}"
  29    fi
  30
  31 -  [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs"
  32 +  [[ -z "${CERTDIR}" ]] && CERTDIR="/var/lib/dehydrated//certs"
  33    [[ -z "${CHAINCACHE}" ]] && CHAINCACHE="${BASEDIR}/chains"
  34    [[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="${BASEDIR}/domains.txt"
  35 -  [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/www/dehydrated"
  36 +  [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/lib/dehydrated/acme-challenge"
  37    [[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock"
  38    [[ -z "${OPENSSL_CNF}" ]] && OPENSSL_CNF="$("${OPENSSL}" version -d | cut -d\" -f2)/openssl.cnf"
  39    [[ -n "${PARAM_LOCKFILE_SUFFIX:-}" ]] && LOCKFILE="${LOCKFILE}-${PARAM_LOCKFILE_SUFFIX}"
  40 --- dehydrated-0.3.1/docs/examples/config       2016-10-17 22:32:37.370663315 +0300
  41 +++ dehydrated-0.3.1/docs/examples/config       2016-11-22 20:02:34.173827857 +0200
  42 @@ -37,13 +37,13 @@
  43  #DOMAINS_TXT="${BASEDIR}/domains.txt"
  44
  45  # Output directory for generated certificates
  46 -#CERTDIR="${BASEDIR}/certs"
  47 +#CERTDIR="/var/lib/dehydrated/certs"
  48
  49  # Directory for account keys and registration information
  50  #ACCOUNTDIR="${BASEDIR}/accounts"
  51
  52  # Output directory for challenge-tokens to be served by webserver or deployed in HOOK (default: /var/www/dehydrated)
  53 -#WELLKNOWN="/var/www/dehydrated"
  54 +#WELLKNOWN="/var/lib/dehydrated/acme-challenge"
  55
  56  # Default keysize for private keys (default: 4096)
  57  #KEYSIZE="4096"
  58 @@ -61,7 +61,7 @@
  59  #
  60  # BASEDIR and WELLKNOWN variables are exported and can be used in an external program
  61  # default: <unset>
  62 -#HOOK=
  63 +HOOK=/etc/webapps/dehydrated/hook.sh
  64
  65  # Chain clean_challenge|deploy_challenge arguments together into one hook call per certificate (default: no)
  66  #HOOK_CHAIN="no"