pld.patch

   1 diff -urNp -x '*.orig' dehydrated-0.7.0.org/dehydrated dehydrated-0.7.0/dehydrated
   2 --- dehydrated-0.7.0.org/dehydrated     2020-12-10 16:54:26.000000000 +0100
   3 +++ dehydrated-0.7.0/dehydrated 2021-04-01 22:30:32.341214536 +0200
   4 @@ -1,4 +1,4 @@
   5 -#!/usr/bin/env bash
   6 +#!/bin/bash
   7
   8  # dehydrated by lukas2511
   9  # Source: https://dehydrated.io
  10 @@ -11,7 +11,7 @@ set -o pipefail
  11  [[ -n "${ZSH_VERSION:-}" ]] && set -o SH_WORD_SPLIT && set +o FUNCTION_ARGZERO && set -o NULL_GLOB && set -o noglob
  12  [[ -z "${ZSH_VERSION:-}" ]] && shopt -s nullglob && set -f
  13
  14 -umask 077 # paranoid umask, we're creating private keys
  15 +umask 027 # allow root and dehydrated group only to protect private keys
  16
  17  # Close weird external file descriptors
  18  exec 3>&-
  19 @@ -310,7 +310,7 @@ verify_config() {
  20  load_config() {
  21    # Check for config in various locations
  22    if [[ -z "${CONFIG:-}" ]]; then
  23 -    for check_config in "/etc/dehydrated" "/usr/local/etc/dehydrated" "${PWD}" "${SCRIPTDIR}"; do
  24 +    for check_config in "/etc/dehydrated" "/etc/webapps/dehydrated" "/usr/local/etc/dehydrated" "/etc/webapps/letsencrypt.sh" "${PWD}" "${SCRIPTDIR}"; do
  25        if [[ -f "${check_config}/config" ]]; then
  26          BASEDIR="${check_config}"
  27          CONFIG="${check_config}/config"
  28 @@ -356,8 +356,8 @@ load_config() {
  29    IP_VERSION=
  30    CHAINCACHE=
  31    AUTO_CLEANUP="no"
  32 -  DEHYDRATED_USER=
  33 -  DEHYDRATED_GROUP=
  34 +  DEHYDRATED_USER="root"
  35 +  DEHYDRATED_GROUP="dehydrated"
  36    API="auto"
  37
  38    if [[ -z "${CONFIG:-}" ]]; then
  39 @@ -461,7 +461,7 @@ load_config() {
  40    # since it's a non-issue and trying to fix existing installations would be too much
  41    # trouble
  42    CAHASH="$(echo "${CA}" | urlbase64)"
  43 -  [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="${BASEDIR}/accounts"
  44 +  [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="/var/lib/dehydrated//accounts"
  45    if [[ ! -e "${ACCOUNTDIR}/${CAHASH}" ]]; then
  46      OLDCAHASH="$(echo "${OLDCA}" | urlbase64)"
  47      mkdir -p "${ACCOUNTDIR}"
  48 @@ -492,11 +492,11 @@ load_config() {
  49      mv "${BASEDIR}/private_key.json" "${ACCOUNT_KEY_JSON}"
  50    fi
  51
  52 -  [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs"
  53 +  [[ -z "${CERTDIR}" ]] && CERTDIR="/var/lib/dehydrated//certs"
  54    [[ -z "${ALPNCERTDIR}" ]] && ALPNCERTDIR="${BASEDIR}/alpn-certs"
  55    [[ -z "${CHAINCACHE}" ]] && CHAINCACHE="${BASEDIR}/chains"
  56    [[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="${BASEDIR}/domains.txt"
  57 -  [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/www/dehydrated"
  58 +  [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/lib/dehydrated/acme-challenge"
  59    [[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock"
  60    [[ -z "${OPENSSL_CNF}" ]] && OPENSSL_CNF="$("${OPENSSL}" version -d | cut -d\" -f2)/openssl.cnf"
  61    [[ -n "${PARAM_LOCKFILE_SUFFIX:-}" ]] && LOCKFILE="${LOCKFILE}-${PARAM_LOCKFILE_SUFFIX}"
  62 diff -urNp -x '*.orig' dehydrated-0.7.0.org/docs/examples/config dehydrated-0.7.0/docs/examples/config
  63 --- dehydrated-0.7.0.org/docs/examples/config   2020-12-10 16:54:26.000000000 +0100
  64 +++ dehydrated-0.7.0/docs/examples/config       2021-04-01 22:30:32.341214536 +0200
  65 @@ -54,16 +54,16 @@
  66  #DOMAINS_TXT="${BASEDIR}/domains.txt"
  67
  68  # Output directory for generated certificates
  69 -#CERTDIR="${BASEDIR}/certs"
  70 +#CERTDIR="/var/lib/dehydrated/certs"
  71
  72  # Output directory for alpn verification certificates
  73 -#ALPNCERTDIR="${BASEDIR}/alpn-certs"
  74 +#ALPNCERTDIR="/var/lib/dehydrated//alpn-certs"
  75
  76  # Directory for account keys and registration information
  77  #ACCOUNTDIR="${BASEDIR}/accounts"
  78
  79  # Output directory for challenge-tokens to be served by webserver or deployed in HOOK (default: /var/www/dehydrated)
  80 -#WELLKNOWN="/var/www/dehydrated"
  81 +#WELLKNOWN="/var/lib/dehydrated/acme-challenge"
  82
  83  # Default keysize for private keys (default: 4096)
  84  #KEYSIZE="4096"
  85 @@ -87,7 +87,7 @@
  86  #
  87  # BASEDIR and WELLKNOWN variables are exported and can be used in an external program
  88  # default: <unset>
  89 -#HOOK=
  90 +HOOK=/etc/webapps/dehydrated/hook.sh
  91
  92  # Chain clean_challenge|deploy_challenge arguments together into one hook call per certificate (default: no)
  93  #HOOK_CHAIN="no"