fix vhost invocation on several module, was missed by last commit, and add the one for redirect_ssl

22 files changed, 30 insertions, 30 deletions

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,
diff --git a/deployment/wikis/manifests/init.pp b/deployment/wikis/manifests/init.pp
index e0e9cda4..901c5953 100644
--- a/deployment/wikis/manifests/init.pp
+++ b/deployment/wikis/manifests/init.pp
@@ -20,9 +20,9 @@ class wikis {
         skinsdir      => "$wikis_templates/skins",
     }
 
-    apache::vhost_redirect_ssl { "wiki.$::domain": }
+    apache::vhost::redirect_ssl { "wiki.$::domain": }
 
-    apache::vhost_base { "ssl_wiki.$::domain":
+    apache::vhost::base { "ssl_wiki.$::domain":
         use_ssl => true,
         vhost   => "wiki.$::domain",
         content => template('wikis/wiki_vhost.conf'),
diff --git a/manifests/nodes/alamut.pp b/manifests/nodes/alamut.pp
index f426d83f..e7ac5e0e 100644
--- a/manifests/nodes/alamut.pp
+++ b/manifests/nodes/alamut.pp
@@ -32,7 +32,7 @@ node alamut {
     # to create all phpbb database on alamut
     phpbb::databases { $fqdn: }
 
-    apache::vhost_redirect_ssl { "forums.$domain": }
+    apache::vhost::redirect_ssl { "forums.$domain": }
     apache::vhost_redirect { "forum.$domain":
         url => "https://forums.$domain/",
     }
diff --git a/modules/bcd/manifests/web.pp b/modules/bcd/manifests/web.pp
index d33506d5..abfa5647 100644
--- a/modules/bcd/manifests/web.pp
+++ b/modules/bcd/manifests/web.pp
@@ -2,7 +2,7 @@ class bcd::web {
     include bcd::base
     $location = "$bcd::home/public_html"
 
-    apache::vhost_base { "bcd.$::domain":
+    apache::vhost::base { "bcd.$::domain":
         location => $location,
         content  => template('bcd/vhost_bcd.conf'),
     }
diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp
index 647ea769..1abdf4d4 100644
--- a/modules/blog/manifests/init.pp
+++ b/modules/blog/manifests/init.pp
@@ -31,12 +31,12 @@ class blog {
 
         include apache::mod::php
 
-        apache::vhost_base { "$blog_domain":
+        apache::vhost::base { "$blog_domain":
             location => $blog_location,
             content => template('blog/blogs_vhosts.conf'),
         }
 
-        apache::vhost_base { "ssl_$blog_domain":
+        apache::vhost::base { "ssl_$blog_domain":
             use_ssl => true,
             vhost => $blog_domain,
             location => $blog_location,
diff --git a/modules/bugzilla/manifests/init.pp b/modules/bugzilla/manifests/init.pp
index 068b6642..313ed6d3 100644
--- a/modules/bugzilla/manifests/init.pp
+++ b/modules/bugzilla/manifests/init.pp
@@ -38,9 +38,9 @@ class bugzilla {
     $bugs_vhost = "bugs.$::domain"
     $vhost_root = '/usr/share/bugzilla/www'
 
-    apache::vhost_redirect_ssl { $bugs_vhost: }
+    apache::vhost::redirect_ssl { $bugs_vhost: }
 
-    apache::vhost_base { $bugs_vhost:
+    apache::vhost::base { $bugs_vhost:
         aliases  => { '/bugzilla/' => $vhost_root },
         use_ssl  => true,
         location => $vhost_root,
diff --git a/modules/buildsystem/manifests/binrepo.pp b/modules/buildsystem/manifests/binrepo.pp
index 195843df..661ee10c 100644
--- a/modules/buildsystem/manifests/binrepo.pp
+++ b/modules/buildsystem/manifests/binrepo.pp
@@ -34,7 +34,7 @@ class buildsystem::binrepo {
         content => template('buildsystem/binrepo/sudoers.binrepo')
     }
 
-    apache::vhost_base { "binrepo.$::domain":
+    apache::vhost::base { "binrepo.$::domain":
         location => $repodir,
         content  => template('buildsystem/binrepo/vhost_binrepo.conf'),
     }
diff --git a/modules/buildsystem/manifests/maintdb.pp b/modules/buildsystem/manifests/maintdb.pp
index bbde4deb..d6eb25bc 100644
--- a/modules/buildsystem/manifests/maintdb.pp
+++ b/modules/buildsystem/manifests/maintdb.pp
@@ -47,7 +47,7 @@ class buildsystem::maintdb {
         require => User[$login],
     }
 
-    apache::vhost_base { "maintdb.$::domain":
+    apache::vhost::base { "maintdb.$::domain":
         location => $dbdir,
         content  => template('buildsystem/maintdb/vhost_maintdb.conf'),
     }
diff --git a/modules/buildsystem/manifests/pkgsubmit.pp b/modules/buildsystem/manifests/pkgsubmit.pp
index f5500717..ba575cd2 100644
--- a/modules/buildsystem/manifests/pkgsubmit.pp
+++ b/modules/buildsystem/manifests/pkgsubmit.pp
@@ -7,7 +7,7 @@ class buildsystem::pkgsubmit {
         ensure => directory,
     }
 
-    apache::vhost_base { "pkgsubmit.$::domain":
+    apache::vhost::base { "pkgsubmit.$::domain":
         aliases  => { '/uploads' => "$sched_home_dir/uploads" },
         location => $location,
         content  => template('buildsystem/vhost_pkgsubmit.conf'),
diff --git a/modules/catdap/manifests/snapshot.pp b/modules/catdap/manifests/snapshot.pp
index 4dc7796f..10695f03 100644
--- a/modules/catdap/manifests/snapshot.pp
+++ b/modules/catdap/manifests/snapshot.pp
@@ -16,5 +16,5 @@ define catdap::snapshot($location, $svn_location) {
         use_ssl  => true,
     }
 
-    apache::vhost_redirect_ssl { $name: }
+    apache::vhost::redirect_ssl { $name: }
 }
diff --git a/modules/dashboard/manifests/init.pp b/modules/dashboard/manifests/init.pp
index 8bf5479f..e644109e 100644
--- a/modules/dashboard/manifests/init.pp
+++ b/modules/dashboard/manifests/init.pp
@@ -34,7 +34,7 @@ class dashboard {
 	    content => template('dashboard/make_report'),
 	}
 
-	apache::vhost_base { "dashboard.$domain":
+	apache::vhost::base { "dashboard.$domain":
 	    location => $dashboard_wwwdir,
 	}
 
diff --git a/modules/epoll/manifests/init.pp b/modules/epoll/manifests/init.pp
index 091da8f3..7d8420c0 100644
--- a/modules/epoll/manifests/init.pp
+++ b/modules/epoll/manifests/init.pp
@@ -10,7 +10,7 @@ class epoll {
         require => Package['Epoll']
     }
 
-    apache::vhost_redirect_ssl { $vhost: }
+    apache::vhost::redirect_ssl { $vhost: }
 
     $pgsql_password = extlookup('epoll_pgsql','x')
 
diff --git a/modules/gitweb/manifests/init.pp b/modules/gitweb/manifests/init.pp
index b9078f5d..d367bc51 100644
--- a/modules/gitweb/manifests/init.pp
+++ b/modules/gitweb/manifests/init.pp
@@ -20,7 +20,7 @@ class gitweb {
         notify  => Service['apache'],
     }
 
-    apache::vhost_base { "gitweb.$::domain":
+    apache::vhost::base { "gitweb.$::domain":
         content => template('gitweb/vhost.conf')
     }
 }
diff --git a/modules/mediawiki/manifests/base.pp b/modules/mediawiki/manifests/base.pp
index 45847235..52600ac1 100644
--- a/modules/mediawiki/manifests/base.pp
+++ b/modules/mediawiki/manifests/base.pp
@@ -23,9 +23,9 @@ class mediawiki::base {
     # TODO create the ldap user
 
     if $vhost {
-        apache::vhost_redirect_ssl { $vhost: }
+        apache::vhost::redirect_ssl { $vhost: }
 
-        apache::vhost_base { "ssl_$vhost":
+        apache::vhost::base { "ssl_$vhost":
             location => $root,
             use_ssl  => true,
             vhost    => $vhost,
diff --git a/modules/phpbb/manifests/base.pp b/modules/phpbb/manifests/base.pp
index e165679f..115c4592 100644
--- a/modules/phpbb/manifests/base.pp
+++ b/modules/phpbb/manifests/base.pp
@@ -31,11 +31,11 @@ class phpbb::base {
     }
 
     # TODO check that everything is locked down
-    apache::vhost_base { "forums.$::domain":
+    apache::vhost::base { "forums.$::domain":
         content => template('phpbb/forums_vhost.conf'),
     }
 
-    apache::vhost_base { "ssl_forums.$::domain":
+    apache::vhost::base { "ssl_forums.$::domain":
         use_ssl => true,
         vhost   => "forums.$::domain",
         content => template('phpbb/forums_vhost.conf'),
diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index 9b047a4d..14930899 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -12,7 +12,7 @@ class planet {
     include apache::mod::php
     include apache::mod::deflate
 
-    apache::vhost_base { "$vhost":
+    apache::vhost::base { "$vhost":
         location => $location,
         content => template('planet/planet_vhosts.conf')
     }
diff --git a/modules/sympa/manifests/init.pp b/modules/sympa/manifests/init.pp
index 5a9affb8..a7fb1fd3 100644
--- a/modules/sympa/manifests/init.pp
+++ b/modules/sympa/manifests/init.pp
@@ -50,9 +50,9 @@ class sympa {
             webapp_file => 'sympa/webapp_sympa.conf',
         }
 
-        apache::vhost_redirect_ssl { $sympa::variable::vhost: }
+        apache::vhost::redirect_ssl { $sympa::variable::vhost: }
 
-        apache::vhost_base { $sympa::variable::vhost:
+        apache::vhost::base { $sympa::variable::vhost:
             use_ssl => true,
             content => template('sympa/vhost_ml.conf'),
         }
diff --git a/modules/transifex/manifests/init.pp b/modules/transifex/manifests/init.pp
index 63383734..1310fb03 100644
--- a/modules/transifex/manifests/init.pp
+++ b/modules/transifex/manifests/init.pp
@@ -50,7 +50,7 @@ class transifex {
         require => Package['transifex'],
     }
 
-    apache::vhost_redirect_ssl { "transifex.$::domain": }
+    apache::vhost::redirect_ssl { "transifex.$::domain": }
 
     # the group are mapped from ldap, since AUTH_LDAP_FIND_GROUP_PERMS is set to yes
     # but the group need to exist in django first
diff --git a/modules/viewvc/manifests/init.pp b/modules/viewvc/manifests/init.pp
index 8a94a004..882fe288 100644
--- a/modules/viewvc/manifests/init.pp
+++ b/modules/viewvc/manifests/init.pp
@@ -28,7 +28,7 @@ class viewvc {
         environment => 'MAILTO=root',
     }
 
-    apache::vhost_base { "svnweb.$::domain":
+    apache::vhost::base { "svnweb.$::domain":
         aliases => {'/viewvc' => '/var/www/viewvc/',
                     '/'       => '/usr/share/viewvc/bin/wsgi/viewvc.fcgi/'},
         content => template('viewvc/vhost.conf')