up to eventum-3.0.9-73-g0d6904c

[packages/eventum.git] / eventum-apache.conf

diff --git a/eventum-apache.conf b/eventum-apache.conf
index bd79620a806142841b83e79fa19e7352704beb41..63dcb7c27abeff8d7be75fe1a822c03fa1522950 100644 (file)
--- a/eventum-apache.conf
+++ b/eventum-apache.conf
@@ -1,24 +1,29 @@
-# $Id$
-
 # Eventum is under /eventum
 Alias /eventum /usr/share/eventum/htdocs
 
 # Eventum is running under VirtualHost
 #NameVirtualHost *:80
 #<VirtualHost *:80>
-#      ServerName eventum
+#      ServerName eventum.example.org
 #      DocumentRoot /usr/share/eventum/htdocs
 #</VirtualHost>
 #NameVirtualHost *:443
 #<VirtualHost *:443>
-#      ServerName eventum
+#      ServerName eventum.example.org
 #      DocumentRoot /usr/share/eventum/htdocs
 #</VirtualHost>
 
 <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,15 +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>
+                       # SCM integration. Set here IP of host running CVS, SVN, Git
+                       Require local
+#                      Require ip xxx.xxx.xxx.xxx
+               </IfModule>
+       </Files>
+
+       # rss has it's own authorization
+       <Files rss.php>
+               # 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>