diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2011-10-22 23:34:20 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2011-10-22 23:34:20 +0000 |
| commit | 8d1847ea2ace8ac78067646e300779636967c254 (patch) | |
| tree | bd6251f1bbe8e8053281c1afe6f6fbdd91882846 /modules/mediawiki | |
| parent | 03d4f63efd778a441b96bf8389adcc12a81d6f9d (diff) | |
| download | puppet-8d1847ea2ace8ac78067646e300779636967c254.tar puppet-8d1847ea2ace8ac78067646e300779636967c254.tar.gz puppet-8d1847ea2ace8ac78067646e300779636967c254.tar.bz2 puppet-8d1847ea2ace8ac78067646e300779636967c254.tar.xz puppet-8d1847ea2ace8ac78067646e300779636967c254.zip | |
only add vhost if vhost option is set
Diffstat (limited to 'modules/mediawiki')
| -rw-r--r-- | modules/mediawiki/manifests/init.pp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/modules/mediawiki/manifests/init.pp b/modules/mediawiki/manifests/init.pp index 9018da13..eb67d477 100644 --- a/modules/mediawiki/manifests/init.pp +++ b/modules/mediawiki/manifests/init.pp @@ -36,14 +36,16 @@ class mediawiki { # TODO create the ldap user - apache::vhost_redirect_ssl { $vhost: } - - apache::vhost_base { "ssl_$vhost": - location => $root, - use_ssl => true, - vhost => $vhost, - content => template("mediawiki/wiki_vhost.conf"), - } + if $vhost { + apache::vhost_redirect_ssl { $vhost: } + + apache::vhost_base { "ssl_$vhost": + location => $root, + use_ssl => true, + vhost => $vhost, + content => template("mediawiki/wiki_vhost.conf"), + } + } |