[packages/horde/HORDE_3_3] apache 2.4 and older compatible config

[glen]

commit 9c2a4ab7fcee8cd3f4a253f028c130625ca4bdc8
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Mar 15 20:46:21 2014 +0200

    apache 2.4 and older compatible config

 horde.conf | 42 +++++++++++++++++++++---------------------
 horde.spec |  2 +-
 2 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/horde.spec b/horde.spec
index ceb893a..06ed338 100644
--- a/horde.spec
+++ b/horde.spec
@@ -14,7 +14,7 @@ Summary(pl.UTF-8):	Wspólny szkielet Horde do wszystkich modułów Horde
 Summary(pt_BR.UTF-8):	Componentes comuns do Horde usados por todos os módulos
 Name:		%{hordeapp}
 Version:	3.3.13
-Release:	2
+Release:	4
 License:	LGPL
 Group:		Applications/WWW
 Source0:	http://ftp.horde.org/pub/horde/%{hordeapp}-%{version}.tar.gz
diff --git a/horde.conf b/horde.conf
index 0620eb6..72868b6 100644
--- a/horde.conf
+++ b/horde.conf
@@ -1,5 +1,3 @@
-# $Id$
-
 <IfModule mod_alias.c>
     Alias /horde /usr/share/horde
 </IfModule>
@@ -7,8 +5,15 @@
 <Directory /usr/share/horde>
     Options Indexes FollowSymLinks
     AllowOverride None
-    Order allow,deny
-    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>
     <IfModule mod_expires.c>
         ExpiresActive On
         ExpiresByType image/png "now plus 1 month"
@@ -19,18 +24,6 @@
     </IfModule>
 </Directory>
 
-<Directory "/usr/share/horde/config">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/usr/share/horde/lib">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/usr/share/horde/locale">
-    order deny,allow
-    deny from all
-</Directory>
 <Directory "/usr/share/horde/rpc">
     <IfModule mod_rewrite.c>
         RewriteEngine On
@@ -39,9 +32,16 @@
         RewriteRule ^(.*)$ index.php/$1 [QSA,L]
     </IfModule>
 </Directory>
-<Directory "/usr/share/horde/templates">
-    order deny,allow
-    deny from all
-</Directory>
 
-# vim: filetype=apache ts=4 sw=4 et
+# Deny access
+<Directory ~ "/usr/share/horde/(config|lib|locale|templates)">
+    # Apache 2.x
+    <IfModule !mod_authz_core.c>
+        Order deny,allow
+        Deny from all
+    </IfModule>
+    # Apache 2.4
+    <IfModule mod_authz_core.c>
+        Require all denied
+    </IfModule>
+</Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/horde.git/commitdiff/9c2a4ab7fcee8cd3f4a253f028c130625ca4bdc8