- back to httpd for now, no time to move /etc/httpd to /etc/apache distro wide

diff --git a/dehydrated.spec b/dehydrated.spec
index cb6c8219a17360e7064151eb906b2fec209da66d..433bc01df69670ca17587e63ccb471931004edb0 100644 (file)
--- a/dehydrated.spec
+++ b/dehydrated.spec
@@ -1,12 +1,12 @@
 Summary:       letsencrypt/acme client implemented as a shell-script
 Name:          dehydrated
 Version:       0.4.0
-Release:       0.2
+Release:       0.3
 License:       MIT
 Group:         Applications/Networking
 Source0:       https://github.com/lukas2511/dehydrated/archive/v%{version}/%{name}-%{version}.tar.gz
 # Source0-md5: 8114ba0144a158d5ad1bdf02e6f43195
-Source1:       apache.conf
+Source1:       httpd.conf
 Source2:       lighttpd.conf
 Source3:       nginx.conf
 Source4:       domains.txt
@@ -63,7 +63,7 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},{/etc/%{name},%{_webapps}/%{name}}/{conf.
        $RPM_BUILD_ROOT/var/lib/%{name}/{accounts,acme-challenges,certs}
 
 install -p %{name} $RPM_BUILD_ROOT%{_sbindir}
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{name}/apache.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{name}/httpd.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_webapps}/%{name}/lighttpd.conf
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_webapps}/%{name}/nginx.conf
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/%{name}/domains.txt
@@ -80,10 +80,10 @@ cp -p %{SOURCE16} $RPM_BUILD_ROOT/etc/%{name}/hooks.d/global
 rm -rf $RPM_BUILD_ROOT
 
 %triggerin -- apache < 2.2.0, apache-base
-%webapp_register apache %{name}
+%webapp_register httpd %{name}
 
 %triggerun -- apache < 2.2.0, apache-base
-%webapp_unregister apache %{name}
+%webapp_unregister httpd %{name}
 
 %triggerin -- lighttpd
 %webapp_register lighttpd %{name}

diff --git a/httpd.conf b/httpd.conf
new file mode 100644 (file)
index 0000000..ac93b93
--- /dev/null
+++ b/httpd.conf
@@ -0,0 +1,12 @@
+Alias /.well-known/acme-challenge /var/lib/dehydrated/acme-challenges
+<Directory /var/lib/dehydrated/acme-challenges>
+       # Apache 2.x
+       <IfModule !mod_authz_core.c>
+               Order allow,deny
+               Allow from all
+       </IfModule>
+       # Apache 2.4
+       <IfModule mod_authz_core.c>
+               Require all granted
+       </IfModule>
+</Directory>