]> git.ipfire.org Git - thirdparty/dehydrated.git/commitdiff
Merge pull request #99 from ymc/feature/add_conf.d_support
authorLukas Schauer <lukas2511@users.noreply.github.com>
Fri, 22 Jan 2016 15:40:21 +0000 (16:40 +0100)
committerLukas Schauer <lukas2511@users.noreply.github.com>
Fri, 22 Jan 2016 15:40:21 +0000 (16:40 +0100)
Add conf.d support

1  2 
letsencrypt.sh

diff --cc letsencrypt.sh
index 2e6924acfd444a1736d78aba4b3336b8a3cfdb4f,7bc51784de3777b18bfa5d6e549c4a48bcf8067c..1352bf5d444dd1ffddc503b0f3f73bf93a04babf
@@@ -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