From f74cd036634f7e30c7e50e5d4d40e14d0a6fc216 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C3=A9cureuil?= <neoclust@mageia.org>
Date: Thu, 6 Apr 2017 14:44:36 +0200
Subject: Port to new apache

---
 .../bugzilla-dev/templates/webapp_bugzilla.conf    | 39 ++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

(limited to 'modules/bugzilla-dev/templates')

diff --git a/modules/bugzilla-dev/templates/webapp_bugzilla.conf b/modules/bugzilla-dev/templates/webapp_bugzilla.conf
index 9c1d546d..b3ec283b 100755
--- a/modules/bugzilla-dev/templates/webapp_bugzilla.conf
+++ b/modules/bugzilla-dev/templates/webapp_bugzilla.conf
@@ -3,8 +3,15 @@ path_data_directory =  "/var/lib/bugzilla"
 %>
 
 <Directory /usr/share/bugzilla/>
-    Order allow,deny
-    Allow from all
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order allow,deny
+        Allow from all
+    </IfModule>
     AllowOverride Limit FileInfo Indexes Options
 
     Options ExecCGI
@@ -15,24 +22,45 @@ path_data_directory =  "/var/lib/bugzilla"
 # duplicates.xul
 <Directory <%= path_data_directory %>>
     <Files duplicates.rdf>
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
         Order allow,deny
         Allow from all
+    </IfModule>
     </Files>
 </Directory>
 
 # The png files locally created locally must be accessible
 <Directory <%= path_data_directory %>/webdot>
     <FilesMatch \.png$>
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
         Order allow,deny
         Allow from all
+    </IfModule>
     </FilesMatch>
 </Directory>
 
 Alias /graphs/ <%= path_data_directory %>/graphs/
 <Directory <%= path_data_directory %>/graphs>
     <FilesMatch \.png$>
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
         Order allow,deny
         Allow from all
+    </IfModule>
     </FilesMatch>
 </Directory>
 
@@ -41,7 +69,14 @@ Alias /graphs/ <%= path_data_directory %>/graphs/
 Alias /extensions/Mageia/web/ <%= scope.lookupvar("bugzilla::extension_location") %>/web/
 <Directory <%= scope.lookupvar("bugzilla::extension_location") %>/web/>
     <FilesMatch \.png$>
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
         Order allow,deny
         Allow from all
+    </IfModule>
     </FilesMatch>
 </Directory>
-- 
cgit v1.2.1