aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-02-22 00:31:59 +0000
committerMichael Scherer <misc@mageia.org>2011-02-22 00:31:59 +0000
commita98bbce05cfa0cb868b7b60e6a82089be12e0451 (patch)
tree32979f2821a1d9f90398cf9f678bd62a187d7d47
parent34d6edbca35fa366dc17d2609956c3ef0885fe3a (diff)
downloadpuppet-a98bbce05cfa0cb868b7b60e6a82089be12e0451.tar
puppet-a98bbce05cfa0cb868b7b60e6a82089be12e0451.tar.gz
puppet-a98bbce05cfa0cb868b7b60e6a82089be12e0451.tar.bz2
puppet-a98bbce05cfa0cb868b7b60e6a82089be12e0451.tar.xz
puppet-a98bbce05cfa0cb868b7b60e6a82089be12e0451.zip
- fix the configuration file, use mod_rewrite instead
of redirect, and use Directory matching for regexp
-rw-r--r--modules/phpbb/templates/forums_vhost.conf10
1 files changed, 7 insertions, 3 deletions
diff --git a/modules/phpbb/templates/forums_vhost.conf b/modules/phpbb/templates/forums_vhost.conf
index bb2721e9..995f1f70 100644
--- a/modules/phpbb/templates/forums_vhost.conf
+++ b/modules/phpbb/templates/forums_vhost.conf
@@ -1,12 +1,16 @@
# TODO redirect based on language settings
# and the presence of the forum
- Redirect / /en/
+
+ # using Redirect create a loop, so we use mod_rewrite here
+ RewriteEngine On
+ RewriteRule ^/$ /en/ [R]
+
AliasMatch ^/(..)/(.*) <%= forums_dir %>/$1/phpBB/$2
- <Directory <%= forums_dir %>/.*/phpBB/>
+ <Directory ~ "<%= forums_dir %>/.*/phpBB/">
Allow from all
</Directory>
- <Directory <%= forums_dir %>/.*/phpBB/install/>
+ <Directory ~ "<%= forums_dir %>/.*/phpBB/install/">
Deny from all
</Directory>