From 7682bcce935de0831a17cfe1c9bdf07ce47c0bab Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mageia.org>
Date: Wed, 4 Apr 2012 17:01:48 +0000
Subject: fix error introduced in commit 2578: proxy to zarb mailman with ssl

---
 deployment/websites/manifests/www.pp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'deployment/websites')

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'],
     }
-- 
cgit v1.2.1