aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2012-04-04 17:01:48 +0000
committerNicolas Vigier <boklm@mageia.org>2012-04-04 17:01:48 +0000
commit7682bcce935de0831a17cfe1c9bdf07ce47c0bab (patch)
treee3c799e85b0da0959d910805308db73b79f75178
parentf6770f369b85649a39fdeb6239b38fce6ee4eed5 (diff)
downloadpuppet-7682bcce935de0831a17cfe1c9bdf07ce47c0bab.tar
puppet-7682bcce935de0831a17cfe1c9bdf07ce47c0bab.tar.gz
puppet-7682bcce935de0831a17cfe1c9bdf07ce47c0bab.tar.bz2
puppet-7682bcce935de0831a17cfe1c9bdf07ce47c0bab.tar.xz
puppet-7682bcce935de0831a17cfe1c9bdf07ce47c0bab.zip
fix error introduced in commit 2578: proxy to zarb mailman with ssl
-rw-r--r--deployment/websites/manifests/www.pp8
1 files changed, 4 insertions, 4 deletions
diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp
index 6e2f3550..03498084 100644
--- a/deployment/websites/manifests/www.pp
+++ b/deployment/websites/manifests/www.pp
@@ -21,10 +21,9 @@ class websites::www {
mode => '0660',
}
- $mailman_content = template('websites/vhost_www.conf',
- 'websites/vhost_proxy_mailman.conf')
apache::vhost::base { $vhost:
- content => $mailman_content,
+ content => template('websites/vhost_www.conf',
+ 'websites/vhost_proxy_mailman.conf'),
location => $vhostdir,
options => ['FollowSymLinks'],
}
@@ -32,7 +31,8 @@ class websites::www {
apache::vhost::base { "ssl_$vhost":
use_ssl => true,
vhost => $vhost,
- content => $mailman_content,
+ content => template('websites/vhost_www.conf',
+ 'websites/vhost_proxy_mailman_ssl.conf'),
location => $vhostdir,
options => ['FollowSymLinks'],
}