aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-02-21 15:14:58 +0000
committerMichael Scherer <misc@mageia.org>2011-02-21 15:14:58 +0000
commit1c7501e2c56403044b8f3d24f11f4a37cf271757 (patch)
tree4b35af014d06a6857e073572e77ad203bb6670f0
parent49802b93e2ee4b63bd9bc58a536b24351eb4e230 (diff)
downloadpuppet-1c7501e2c56403044b8f3d24f11f4a37cf271757.tar
puppet-1c7501e2c56403044b8f3d24f11f4a37cf271757.tar.gz
puppet-1c7501e2c56403044b8f3d24f11f4a37cf271757.tar.bz2
puppet-1c7501e2c56403044b8f3d24f11f4a37cf271757.tar.xz
puppet-1c7501e2c56403044b8f3d24f11f4a37cf271757.zip
- add vhost for forums
-rw-r--r--modules/phpbb/manifests/init.pp5
-rw-r--r--modules/phpbb/templates/forums_vhost.conf12
2 files changed, 17 insertions, 0 deletions
diff --git a/modules/phpbb/manifests/init.pp b/modules/phpbb/manifests/init.pp
index 438a28f0..1e04b76a 100644
--- a/modules/phpbb/manifests/init.pp
+++ b/modules/phpbb/manifests/init.pp
@@ -37,6 +37,11 @@ class phpbb {
owner => root,
group => root,
}
+
+ apache::vhost_base { "forums.$domain":
+ content => template("phpbb/forums_vhost.conf"),
+ }
+
}
define phpbb_config($value) {
diff --git a/modules/phpbb/templates/forums_vhost.conf b/modules/phpbb/templates/forums_vhost.conf
new file mode 100644
index 00000000..bb2721e9
--- /dev/null
+++ b/modules/phpbb/templates/forums_vhost.conf
@@ -0,0 +1,12 @@
+ # TODO redirect based on language settings
+ # and the presence of the forum
+ Redirect / /en/
+ AliasMatch ^/(..)/(.*) <%= forums_dir %>/$1/phpBB/$2
+
+ <Directory <%= forums_dir %>/.*/phpBB/>
+ Allow from all
+ </Directory>
+
+ <Directory <%= forums_dir %>/.*/phpBB/install/>
+ Deny from all
+ </Directory>