tld.patch

   1 diff -ur dehydrated-0.4.0.orig/dehydrated dehydrated-0.4.0/dehydrated
   2 --- dehydrated-0.4.0.orig/dehydrated    2017-02-05 15:33:17.000000000 +0100
   3 +++ dehydrated-0.4.0/dehydrated 2017-10-24 16:58:33.761256185 +0200
   4 @@ -1,4 +1,4 @@
   5 -#!/usr/bin/env bash
   6 +#!/bin/bash
   7
   8  # dehydrated by lukas2511
   9  # Source: https://github.com/lukas2511/dehydrated
  10 @@ -20,7 +20,7 @@
  11  done
  12  SCRIPTDIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
  13
  14 -BASEDIR="${SCRIPTDIR}"
  15 +BASEDIR="/var/lib/dehydrated"
  16
  17  # Create (identifiable) temporary files
  18  _mktemp() {
  19 @@ -115,7 +115,7 @@
  20    DOMAINS_TXT=
  21    HOOK=
  22    HOOK_CHAIN="no"
  23 -  RENEW_DAYS="30"
  24 +  RENEW_DAYS="10"
  25    KEYSIZE="4096"
  26    WELLKNOWN=
  27    PRIVATE_KEY_RENEW="yes"
  28 @@ -182,8 +182,8 @@
  29    fi
  30
  31    [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs"
  32 -  [[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="${BASEDIR}/domains.txt"
  33 -  [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/www/dehydrated"
  34 +  [[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="/etc/dehydrated/domains.txt"
  35 +  [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="${BASEDIR}/acme-challenges"
  36    [[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock"
  37    [[ -n "${PARAM_LOCKFILE_SUFFIX:-}" ]] && LOCKFILE="${LOCKFILE}-${PARAM_LOCKFILE_SUFFIX}"
  38    [[ -n "${PARAM_NO_LOCK:-}" ]] && LOCKFILE=""
  39 diff -ur dehydrated-0.4.0.orig/docs/examples/config dehydrated-0.4.0/docs/examples/config
  40 --- dehydrated-0.4.0.orig/docs/examples/config  2017-02-05 15:33:17.000000000 +0100
  41 +++ dehydrated-0.4.0/docs/examples/config       2017-10-24 16:58:47.821256753 +0200
  42 @@ -33,11 +33,11 @@
  43  # default: <unset>
  44  #CONFIG_D=
  45
  46 -# Base directory for account key, generated certificates and list of domains (default: $SCRIPTDIR -- uses config directory if undefined)
  47 -#BASEDIR=$SCRIPTDIR
  48 +# Base directory for account key, generated certificates and list of domains (default: /var/lib/dehydrated)
  49 +#BASEDIR="/var/lib/dehydrated"
  50
  51  # File containing the list of domains to request certificates for (default: $BASEDIR/domains.txt)
  52 -#DOMAINS_TXT="${BASEDIR}/domains.txt"
  53 +#DOMAINS_TXT="/etc/dehydrated/domains.txt"
  54
  55  # Output directory for generated certificates
  56  #CERTDIR="${BASEDIR}/certs"
  57 @@ -46,7 +46,7 @@
  58  #ACCOUNTDIR="${BASEDIR}/accounts"
  59
  60  # Output directory for challenge-tokens to be served by webserver or deployed in HOOK (default: /var/www/dehydrated)
  61 -#WELLKNOWN="/var/www/dehydrated"
  62 +#WELLKNOWN="${BASEDIR}/acme-challenges"
  63
  64  # Default keysize for private keys (default: 4096)
  65  #KEYSIZE="4096"
  66 @@ -64,13 +64,13 @@
  67  #
  68  # BASEDIR and WELLKNOWN variables are exported and can be used in an external program
  69  # default: <unset>
  70 -#HOOK=
  71 +#HOOK="/etc/dehydrated/hook.sh"
  72
  73  # Chain clean_challenge|deploy_challenge arguments together into one hook call per certificate (default: no)
  74  #HOOK_CHAIN="no"
  75
  76 -# Minimum days before expiration to automatically renew certificate (default: 30)
  77 -#RENEW_DAYS="30"
  78 +# Minimum days before expiration to automatically renew certificate (default: 10)
  79 +#RENEW_DAYS="10"
  80
  81  # Regenerate private keys instead of just signing new certificates on renewal (default: yes)
  82  #PRIVATE_KEY_RENEW="yes"