aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2017-05-25 20:55:01 +0300
committerThomas Backlund <tmb@mageia.org>2017-05-25 20:55:01 +0300
commit13f7c9549e9d7a6af7cd705ab84f49966b308a3a (patch)
tree27a41e4747f929c17521d3df8d0a5728fb7e631f
parentbf876aa23bce24d1c833b912cc56a27a21f71d6c (diff)
downloadpuppet-13f7c9549e9d7a6af7cd705ab84f49966b308a3a.tar
puppet-13f7c9549e9d7a6af7cd705ab84f49966b308a3a.tar.gz
puppet-13f7c9549e9d7a6af7cd705ab84f49966b308a3a.tar.bz2
puppet-13f7c9549e9d7a6af7cd705ab84f49966b308a3a.tar.xz
puppet-13f7c9549e9d7a6af7cd705ab84f49966b308a3a.zip
forums: fix apache 2.4 conf
-rw-r--r--modules/phpbb/templates/forums_vhost.conf17
1 files changed, 16 insertions, 1 deletions
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 -%>