commit 9792a66e5935ab3d379b34ae283202b467e27462
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Tue Mar 20 21:37:41 2018 +0100
- up to 0.6.1
dehydrated.spec | 4 ++--
pld.patch | 21 +++++++++++----------
2 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/dehydrated.spec b/dehydrated.spec
index aadf08e..abfe85d 100644
--- a/dehydrated.spec
+++ b/dehydrated.spec
@@ -1,11 +1,11 @@
Summary: letsencrypt/acme client implemented as a shell-script
Name: dehydrated
-Version: 0.4.0
+Version: 0.6.1
Release: 1
License: MIT
Group: Applications/Networking
Source0:
https://github.com/lukas2511/dehydrated/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 8114ba0144a158d5ad1bdf02e6f43195
+# Source0-md5: 97425cf8aaa1a9a1a86036a1b7611a8c
Source1: apache.conf
Source2: lighttpd.conf
Source3: nginx.conf
diff --git a/pld.patch b/pld.patch
index d9a90f1..c02a0c3 100644
--- a/pld.patch
+++ b/pld.patch
@@ -15,27 +15,28 @@
if [[ -f "${check_config}/config" ]]; then
BASEDIR="${check_config}"
CONFIG="${check_config}/config"
-@@ -164,7 +164,7 @@
- [[ -d "${BASEDIR}" ]] || _exiterr "BASEDIR does not exist: ${BASEDIR}"
+@@ -224,7 +224,7 @@ load_config() {
+ # Create new account directory or symlink to account directory from old CA
CAHASH="$(echo "${CA}" | urlbase64)"
- [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="${BASEDIR}/accounts"
-+ [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="/var/lib/dehydrated/accounts"
- mkdir -p "${ACCOUNTDIR}/${CAHASH}"
- [[ -f "${ACCOUNTDIR}/${CAHASH}/config" ]] && .
"${ACCOUNTDIR}/${CAHASH}/config"
- ACCOUNT_KEY="${ACCOUNTDIR}/${CAHASH}/account_key.pem"
-@@ -179,9 +179,9 @@
++ [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="/var/lib/dehydrated//accounts"
+ if [[ ! -e "${ACCOUNTDIR}/${CAHASH}" ]]; then
+ OLDCAHASH="$(echo "${OLDCA}" | urlbase64)"
+ mkdir -p "${ACCOUNTDIR}"
+@@ -249,10 +249,10 @@ load_config() {
mv "${BASEDIR}/private_key.json" "${ACCOUNT_KEY_JSON}"
fi
- [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs"
-+ [[ -z "${CERTDIR}" ]] && CERTDIR="/var/lib/dehydrated/certs"
++ [[ -z "${CERTDIR}" ]] && CERTDIR="/var/lib/dehydrated//certs"
+ [[ -z "${CHAINCACHE}" ]] && CHAINCACHE="${BASEDIR}/chains"
[[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="${BASEDIR}/domains.txt"
- [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/www/dehydrated"
+ [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/lib/dehydrated/acme-challenge"
[[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock"
- [[ -n "${PARAM_NO_LOCK:-}" ]] && LOCKFILE=""
-
+ [[ -z "${OPENSSL_CNF}" ]] && OPENSSL_CNF="$("${OPENSSL}" version -d | cut
-d\" -f2)/openssl.cnf"
+ [[ -n "${PARAM_LOCKFILE_SUFFIX:-}" ]] &&
LOCKFILE="${LOCKFILE}-${PARAM_LOCKFILE_SUFFIX}"
--- dehydrated-0.3.1/docs/examples/config 2016-10-17 22:32:37.370663315
+0300
+++ dehydrated-0.3.1/docs/examples/config 2016-11-22 20:02:34.173827857
+0200
@@ -37,13 +37,13 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dehydrated.git/commitdiff/9792a66e5935ab3d379b34ae283202b467e27462
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
