--- puppet/deployment/websites/manifests/www.pp	2013/04/14 14:38:33	3046
+++ puppet/deployment/websites/manifests/www.pp	2013/04/14 14:58:03	3047
@@ -24,8 +24,7 @@
 
     apache::vhost::base { $vhost:
         content  => template('websites/vhost_www.conf',
-                             'websites/vhost_www_rewrite.conf',
-	                     'websites/vhost_proxy_mailman.conf'),
+                             'websites/vhost_www_rewrite.conf'),
         location => $vhostdir,
         options  => ['FollowSymLinks'],
     }
@@ -34,8 +33,7 @@
         use_ssl  => true,
         vhost    => $vhost,
         content  => template('websites/vhost_www.conf',
-                             'websites/vhost_www_rewrite.conf',
-	                     'websites/vhost_proxy_mailman_ssl.conf'),
+                             'websites/vhost_www_rewrite.conf'),
         location => $vhostdir,
         options  => ['FollowSymLinks'],
     }