commit 3ec257e08bf5ddaeab2499d0e7f69e247acb32f1 Author: Elan Ruusamäe <g...@delfi.ee> Date: Mon Oct 17 22:30:30 2016 +0300
use upstream config (from examples) config.sh | 2 -- dehydrated.spec | 3 +-- pld.patch | 20 ++++++++++++++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) --- diff --git a/dehydrated.spec b/dehydrated.spec index 8a8048d..5d653dc 100644 --- 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/config.sh b/config.sh deleted file mode 100644 index fe722f3..0000000 --- a/config.sh +++ /dev/null @@ -1,2 +0,0 @@ -#CONTACT_EMAIL=r...@example.org -HOOK=/etc/webapps/dehydrated/hook.sh diff --git a/pld.patch b/pld.patch index d9513ef..cb9d7da 100644 --- 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" ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/dehydrated.git/commitdiff/3ec257e08bf5ddaeab2499d0e7f69e247acb32f1 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit