commit 2e509387da05813b8ccc44ae5e13fa5bca400871 Author: Elan Ruusamäe <g...@delfi.ee> Date: Mon Oct 17 22:14:33 2016 +0300
challenges dir set to /var/lib/dehydrated apache.conf | 4 ++-- dehydrated.spec | 8 ++++---- lighttpd.conf | 2 +- pld.patch | 9 +++++++++ 4 files changed, 16 insertions(+), 7 deletions(-) --- diff --git a/dehydrated.spec b/dehydrated.spec index ebfd1f2..25a8c6c 100644 --- a/dehydrated.spec +++ b/dehydrated.spec @@ -33,6 +33,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _webapp %{name} %define _sysconfdir %{_webapps}/%{_webapp} %define _appdir %{_datadir}/%{_webapp} +%define challengedir /var/lib/%{name} %description This is a client for signing certificates with an ACME-server @@ -52,7 +53,7 @@ Current features: %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/{acme-challenges,certs},/etc/cron.d} +install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/certs,/etc/cron.d,%{challengedir}} install -p %{name} $RPM_BUILD_ROOT%{_sbindir} cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf @@ -96,7 +97,6 @@ rm -rf $RPM_BUILD_ROOT %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config.sh %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/domains.txt %attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hook.sh -# challenges written here, need to be readable by webserver -%dir %attr(751,root,root) %{_sysconfdir}/acme-challenges - %attr(755,root,root) %{_sbindir}/%{name} +# challenges written here, need to be readable by webserver +%dir %attr(751,root,root) %{challengedir} diff --git a/apache.conf b/apache.conf index 5f207b5..1aa893e 100644 --- a/apache.conf +++ b/apache.conf @@ -1,5 +1,5 @@ -Alias /.well-known/acme-challenge /etc/webapps/letsencrypt.sh/acme-challenges -<Directory /etc/webapps/letsencrypt.sh/acme-challenges> +Alias /.well-known/acme-challenge /var/lib/dehydrated +<Directory /var/lib/dehydrated> # Apache 2.x <IfModule !mod_authz_core.c> Order allow,deny diff --git a/lighttpd.conf b/lighttpd.conf index 5b51255..ce965aa 100644 --- a/lighttpd.conf +++ b/lighttpd.conf @@ -1,3 +1,3 @@ alias.url += ( - "/.well-known/acme-challenge" => "/etc/webapps/letsencrypt.sh/acme-challenges", + "/.well-known/acme-challenge" => "/var/lib/dehydrated", ) diff --git a/pld.patch b/pld.patch index e3f43e2..d9513ef 100644 --- a/pld.patch +++ b/pld.patch @@ -15,3 +15,12 @@ if [[ -f "${check_config}/config" ]]; then BASEDIR="${check_config}" CONFIG="${check_config}/config" +@@ -181,7 +181,7 @@ + + [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs" + [[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="${BASEDIR}/domains.txt" +- [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/www/dehydrated" ++ [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/lib/dehydrated" + [[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock" + [[ -n "${PARAM_NO_LOCK:-}" ]] && LOCKFILE="" + ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/dehydrated.git/commitdiff/4c3f6e0b560241545bb2e41603cd5213ad44717b _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit