From c7b761dabd635dc581322d8be0832a5da9ff8b99 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Sun, 25 Mar 2012 12:47:26 +0000
Subject: fix vhost invocation on several module, was missed by last commit,
 and add the one for redirect_ssl

---
 deployment/websites/manifests/hugs.pp     | 2 +-
 deployment/websites/manifests/pkgcpan.pp  | 2 +-
 deployment/websites/manifests/releases.pp | 4 ++--
 deployment/websites/manifests/www.pp      | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'deployment/websites')

diff --git a/deployment/websites/manifests/hugs.pp b/deployment/websites/manifests/hugs.pp
index 472066c7..49fe6ac7 100644
--- a/deployment/websites/manifests/hugs.pp
+++ b/deployment/websites/manifests/hugs.pp
@@ -4,7 +4,7 @@ class websites::hugs {
     $vhostdir = "$websites::base::webdatadir/hugs.$::domain"
     $svn_location = "svn://svn.$::domain/svn/web/hugs/public/"
 
-    apache::vhost_base { "hugs.$::domain":
+    apache::vhost::base { "hugs.$::domain":
         location => $vhostdir,
     }
 
diff --git a/deployment/websites/manifests/pkgcpan.pp b/deployment/websites/manifests/pkgcpan.pp
index 592ea92b..c259d06c 100644
--- a/deployment/websites/manifests/pkgcpan.pp
+++ b/deployment/websites/manifests/pkgcpan.pp
@@ -10,7 +10,7 @@ class websites::pkgcpan {
         home       => $homedir,
     }
 
-    apache::vhost_base { $vhost:
+    apache::vhost::base { $vhost:
         location => $vhostdir,
         options  => [ 'Indexes' ],
     }
diff --git a/deployment/websites/manifests/releases.pp b/deployment/websites/manifests/releases.pp
index 26d14bcf..1d52201c 100644
--- a/deployment/websites/manifests/releases.pp
+++ b/deployment/websites/manifests/releases.pp
@@ -4,12 +4,12 @@ class websites::releases {
     $vhostdir = "$websites::base::webdatadir/$vhost"
     $svn_location = "svn://svn.$::domain/svn/web/releases/"
 
-    apache::vhost_base { $vhost:
+    apache::vhost::base { $vhost:
         location => $vhostdir,
         options  => [ 'FollowSymLinks' ],
     }
 
-    apache::vhost_base { "ssl_$vhost":
+    apache::vhost::base { "ssl_$vhost":
         vhost    => $vhost,
         use_ssl  => true,
         location => $vhostdir,
diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp
index a2ce89f4..6e2f3550 100644
--- a/deployment/websites/manifests/www.pp
+++ b/deployment/websites/manifests/www.pp
@@ -23,13 +23,13 @@ class websites::www {
 
     $mailman_content = template('websites/vhost_www.conf',
                                 'websites/vhost_proxy_mailman.conf')
-    apache::vhost_base { $vhost:
+    apache::vhost::base { $vhost:
         content  => $mailman_content,
         location => $vhostdir,
         options  => ['FollowSymLinks'],
     }
 
-    apache::vhost_base { "ssl_$vhost":
+    apache::vhost::base { "ssl_$vhost":
         use_ssl  => true,
         vhost    => $vhost,
         content  => $mailman_content,
-- 
cgit v1.2.1