aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mediawiki/manifests
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-10-22 23:29:31 +0000
committerNicolas Vigier <boklm@mageia.org>2011-10-22 23:29:31 +0000
commit3e09fd8d7fc938cdfc1ed1e28527d2fd91b1378a (patch)
treea50999b189647466888b7c5e453b996af133e486 /modules/mediawiki/manifests
parent89110d3f9537e8bc5dfc49b106407063ff5c3aa8 (diff)
downloadpuppet-3e09fd8d7fc938cdfc1ed1e28527d2fd91b1378a.tar
puppet-3e09fd8d7fc938cdfc1ed1e28527d2fd91b1378a.tar.gz
puppet-3e09fd8d7fc938cdfc1ed1e28527d2fd91b1378a.tar.bz2
puppet-3e09fd8d7fc938cdfc1ed1e28527d2fd91b1378a.tar.xz
puppet-3e09fd8d7fc938cdfc1ed1e28527d2fd91b1378a.zip
add a vhost option
Diffstat (limited to 'modules/mediawiki/manifests')
-rw-r--r--modules/mediawiki/manifests/init.pp12
1 files changed, 8 insertions, 4 deletions
diff --git a/modules/mediawiki/manifests/init.pp b/modules/mediawiki/manifests/init.pp
index 3e4137e9..49089584 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -1,6 +1,10 @@
class mediawiki {
- class config($pgsql_password, $secretkey, $ldap_password) {
- }
+ class config(
+ $pgsql_password,
+ $secretkey,
+ $ldap_password,
+ $vhost = "wiki.$domain"
+ ) { }
class base inherits config {
@@ -32,9 +36,9 @@ class mediawiki {
# TODO create the ldap user
- apache::vhost_redirect_ssl { "wiki.$domain": }
+ apache::vhost_redirect_ssl { $vhost: }
- apache::vhost_base { "ssl_wiki.$domain":
+ apache::vhost_base { "ssl_$vhost":
location => $root,
use_ssl => true,
vhost => "wiki.$domain",