simplify

[projects/template-specs.git] / webapp.spec

diff --git a/webapp.spec b/webapp.spec
index a35302318ba064887233c1b1ee726c9760ca968f..312a45b7ddc6b0537df86cc30d7ac8033017a08b 100644 (file)
--- a/webapp.spec
+++ b/webapp.spec
@@ -46,7 +46,15 @@ konfiguracji aplikacji WWW do katalogu konfiguracyjnego serwera WWW.
 cat > apache.conf <<'EOF'
 Alias /%{name} %{_appdir}
 <Directory %{_appdir}>
-       Allow from all
+       # 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>
 EOF
 
@@ -75,6 +83,9 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 # %webapp_* macros usage extracted from /usr/lib/rpm/macros.build:
 #
 # Usage:
@@ -99,9 +110,6 @@ cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
 %triggerun -- lighttpd
 %webapp_unregister lighttpd %{_webapp}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(644,root,root,755)
 %dir %attr(750,root,http) %{_sysconfdir}