From 13f7c9549e9d7a6af7cd705ab84f49966b308a3a Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Thu, 25 May 2017 20:55:01 +0300
Subject: forums: fix apache 2.4 conf

---
 modules/phpbb/templates/forums_vhost.conf | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/modules/phpbb/templates/forums_vhost.conf b/modules/phpbb/templates/forums_vhost.conf
index 014cf902..2a8234e6 100644
--- a/modules/phpbb/templates/forums_vhost.conf
+++ b/modules/phpbb/templates/forums_vhost.conf
@@ -13,7 +13,15 @@
     AliasMatch ^/(..)/(.*) <%= forums_dir %>/$1/phpBB/$2
 
     <Directory ~ "<%= forums_dir %>/.*/phpBB/">
+    <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>
     </Directory>
 
 <%- 
@@ -35,8 +43,15 @@ forbidden = ['install',
 for f in forbidden
 -%>
     <Directory <%= forums_dir %>/.*/phpBB/<%= f %>/ >
-        Order Allow,Deny
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        Require all denied
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order Deny,Allow
         Deny from all
+    </IfModule>
     </Directory>
 
 <%- end -%>
-- 
cgit v1.2.1