From: Lukas Schauer <lukas2511@users.noreply.github.com>
Date: Fri, 22 Jan 2016 15:40:21 +0000 (+0100)
Subject: Merge pull request #99 from ymc/feature/add_conf.d_support
X-Git-Tag: v0.1.0~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8636929fcd2ddce9586395ccb790f1ffaf11930a;p=thirdparty%2Fdehydrated.git

Merge pull request #99 from ymc/feature/add_conf.d_support

Add conf.d support
---

8636929fcd2ddce9586395ccb790f1ffaf11930a
diff --cc letsencrypt.sh
index 2e6924a,7bc5178..1352bf5
--- a/letsencrypt.sh
+++ b/letsencrypt.sh
@@@ -47,16 -47,17 +47,17 @@@ load_config() 
    CA="https://acme-v01.api.letsencrypt.org/directory"
    LICENSE="https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf"
    CHALLENGETYPE="http-01"
+   CONFIG_D=
    HOOK=
    RENEW_DAYS="30"
 -  PRIVATE_KEY="${BASEDIR}/private_key.pem"
 +  PRIVATE_KEY=
    KEYSIZE="4096"
 -  WELLKNOWN="${BASEDIR}/.acme-challenges"
 +  WELLKNOWN=
    PRIVATE_KEY_RENEW="no"
    KEY_ALGO=rsa
 -  OPENSSL_CNF="$(openssl version -d | cut -d'"' -f2)/openssl.cnf"
 +  OPENSSL_CNF="$(openssl version -d | cut -d\" -f2)/openssl.cnf"
    CONTACT_EMAIL=
 -  LOCKFILE="${BASEDIR}/lock"
 +  LOCKFILE=
  
    if [[ -z "${CONFIG:-}" ]]; then
      echo "#" >&2