-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
%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
%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
%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}
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=""
+