use upstream config (from examples)

diff --git a/config.sh b/config.sh
deleted file mode 100644 (file)
index fe722f3..0000000
--- a/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#CONTACT_EMAIL=root@example.org
-HOOK=/etc/webapps/dehydrated/hook.sh

diff --git a/dehydrated.spec b/dehydrated.spec
index 8a8048d7388788d961e00f80632d9dc6a5177ccd..5d653dc4e6d1479254400234c3ee4d76aeb6e705 100644 (file)
--- a/dehydrated.spec
+++ b/dehydrated.spec
@@ -8,7 +8,6 @@ Source0:        https://github.com/lukas2511/dehydrated/archive/v%{version}/%{name}-%{v
 # Source0-md5: 7a3b92b963da6469c4a53f051d6efa24
 Source1:       apache.conf
 Source2:       lighttpd.conf
-Source3:       config.sh
 Source4:       domains.txt
 Source5:       hook.sh
 Source6:       crontab
@@ -58,7 +57,7 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/certs,/etc/cron.d,%{challe
 install -p %{name} $RPM_BUILD_ROOT%{_sbindir}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
-cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/config
+cp -p docs/examples/config $RPM_BUILD_ROOT%{_sysconfdir}
 cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/cron.d/%{name}
 install -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}

diff --git a/pld.patch b/pld.patch
index d9513efccde6646287379697d10c0908b8e1e363..cb9d7da749c37922ae67d206921ec1c24c7cee3a 100644 (file)
--- a/pld.patch
+++ b/pld.patch
@@ -24,3 +24,23 @@
    [[ -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 @@
+ #ACCOUNTDIR="${BASEDIR}/accounts"
+ 
+ # Output directory for challenge-tokens to be served by webserver or deployed in HOOK (default: /var/www/dehydrated)
+-#WELLKNOWN="/var/www/dehydrated"
++#WELLKNOWN="/var/lib/dehydrated"
+ 
+ # Default keysize for private keys (default: 4096)
+ #KEYSIZE="4096"
+@@ -61,7 +61,7 @@
+ #
+ # BASEDIR and WELLKNOWN variables are exported and can be used in an external program
+ # default: <unset>
+-#HOOK=
++HOOK=/etc/webapps/dehydrated/hook.sh
+ 
+ # Chain clean_challenge|deploy_challenge arguments together into one hook call per certificate (default: no)
+ #HOOK_CHAIN="no"