add certs dir, also in /var

diff --git a/dehydrated.spec b/dehydrated.spec
index ac2b9ae900cb0ed210a98ead9607dc3484015cef..56089e5a3dbf0f7048f9cce52272c7ee6e20d338 100644 (file)
--- a/dehydrated.spec
+++ b/dehydrated.spec
@@ -1,7 +1,7 @@
 Summary:       letsencrypt/acme client implemented as a shell-script
 Name:          dehydrated
 Version:       0.3.1
-Release:       0.4
+Release:       0.5
 License:       MIT
 Group:         Applications/Networking
 Source0:       https://github.com/lukas2511/dehydrated/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -52,7 +52,7 @@ Current features:
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/certs,/etc/cron.d} \
-       $RPM_BUILD_ROOT/var/lib/%{name}/{accounts,acme-challenge}
+       $RPM_BUILD_ROOT/var/lib/%{name}/{accounts,acme-challenge,certs}
 
 install -p %{name} $RPM_BUILD_ROOT%{_sbindir}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
@@ -89,7 +89,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.md CHANGELOG LICENSE
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name}
 %dir %attr(750,root,http) %{_sysconfdir}
-%dir %attr(700,root,root) %{_sysconfdir}/certs
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf
@@ -99,5 +98,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/%{name}
 %dir %attr(751,root,root) /var/lib/%{name}
 %dir %attr(700,root,root) /var/lib/%{name}/accounts
+%dir %attr(700,root,root) /var/lib/%{name}/certs
 # challenges written here, need to be readable by webserver
 %dir %attr(751,root,root) /var/lib/%{name}/acme-challenge

diff --git a/pld.patch b/pld.patch
index 1244848ef1ac3003ad37c08f12d1d27960c30f05..f852bea6262c14de497eeee22fd7972dbf616bfd 100644 (file)
--- a/pld.patch
+++ b/pld.patch
@@ -1,5 +1,5 @@
---- dehydrated-0.3.1/dehydrated        2016-10-17 22:03:54.184281322 +0300
-+++ dehydrated-0.3.1/dehydrated        2016-11-22 19:57:26.978516490 +0200
+--- dehydrated-0.3.1/dehydrated        2016-11-22 19:57:26.978516490 +0200
++++ dehydrated-0.3.1/dehydrated        2016-11-22 20:01:59.118747292 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/bash
@@ -24,18 +24,28 @@
    mkdir -p "${ACCOUNTDIR}/${CAHASH}"
    [[ -f "${ACCOUNTDIR}/${CAHASH}/config" ]] && . "${ACCOUNTDIR}/${CAHASH}/config"
    ACCOUNT_KEY="${ACCOUNTDIR}/${CAHASH}/account_key.pem"
-@@ -181,7 +181,7 @@
+@@ -179,9 +179,9 @@
+     mv "${BASEDIR}/private_key.json" "${ACCOUNT_KEY_JSON}"
+   fi
  
-   [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs"
+-  [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs"
++  [[ -z "${CERTDIR}" ]] && CERTDIR="/var/lib/dehydrated/certs"
    [[ -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=""
  
---- dehydrated-0.3.1/docs/examples/config~     2016-09-13 21:00:43.000000000 +0300
-+++ dehydrated-0.3.1/docs/examples/config      2016-10-17 22:32:37.370663315 +0300
-@@ -43,7 +43,7 @@
+--- 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 @@
+ #DOMAINS_TXT="${BASEDIR}/domains.txt"
+ 
+ # Output directory for generated certificates
+-#CERTDIR="${BASEDIR}/certs"
++#CERTDIR="/var/lib/dehydrated/certs"
+ 
+ # Directory for account keys and registration information
  #ACCOUNTDIR="${BASEDIR}/accounts"
  
  # Output directory for challenge-tokens to be served by webserver or deployed in HOOK (default: /var/www/dehydrated)