[packages/eventum] apache versions support

[glen]

commit a935e701c6f46c8a922c4bb7d1506775b94a4de6
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Nov 28 22:57:17 2013 +0200

    apache versions support

 eventum-apache.conf | 49 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 10 deletions(-)
---
diff --git a/eventum-apache.conf b/eventum-apache.conf
index 51c12bb..54f4d43 100644
--- a/eventum-apache.conf
+++ b/eventum-apache.conf
@@ -1,5 +1,3 @@
-# $Id$
-
 # Eventum is under /eventum
 Alias /eventum /usr/share/eventum/htdocs
 
@@ -17,8 +15,15 @@ Alias /eventum /usr/share/eventum/htdocs
 
 <Directory /usr/share/eventum/htdocs>
 	AllowOverride None
-	Order deny,allow
-	Allow from all
+	# Apache < 2.4
+	<IfModule !mod_authz_core.c>
+		Order allow,deny
+		Allow from all
+	</IfModule>
+	# Apache 2.4
+	<IfModule mod_authz_core.c>
+		Require all granted
+	</IfModule>
 
 	# Make whole eventum password protected
 #	AllowOverride None
@@ -32,20 +37,44 @@ Alias /eventum /usr/share/eventum/htdocs
 
 	# for SCM integration
 	<Files scm_ping.php>
-		Order allow,deny
-		# Set here IP of host running CVS
-		Allow from 127.0.0.1
+		# Apache < 2.4
+		<IfModule !mod_authz_core.c>
+			Order allow,deny
+			Allow from 127.0.0.1
+		</IfModule>
+		# Apache 2.4
+		<IfModule mod_authz_core.c>
+			# Set here IP of host running CVS
+			Require local
+#			Require ip xxx.xxx.xxx.xxx
+		</IfModule>
 	</Files>
 
 	# rss has it's own authorization
 	<Files rss.php>
-		Allow from all
+		# Apache < 2.4
+		<IfModule !mod_authz_core.c>
+			Order allow,deny
+			Allow from all
+		</IfModule>
+		# Apache 2.4
+		<IfModule mod_authz_core.c>
+			Require all granted
+		</IfModule>
 	</Files>
 </Directory>
 
 # RPC for CLI interface
 <Directory /usr/share/eventum/htdocs/rpc>
-	Order allow,deny
 	# Add here clients whom you want to allow CLI access
-	Allow from 127.0.0.1
+	# Apache < 2.4
+	<IfModule !mod_authz_core.c>
+		Order allow,deny
+		Allow from 127.0.0.1
+	</IfModule>
+	# Apache 2.4
+	<IfModule mod_authz_core.c>
+		Require local
+#		Require ip xxx.xxx.xxx.xxx
+	</IfModule>
 </Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/a935e701c6f46c8a922c4bb7d1506775b94a4de6