From 9f52ab2655acccd47cf7e3a824b603c5d6846f35 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sat, 8 Oct 2011 12:31:14 +0200
Subject: migrating a first part over to the new partial style

---
 manifests/vhost/gitweb.pp    | 2 +-
 manifests/vhost/passenger.pp | 2 --
 manifests/vhost/proxy.pp     | 2 +-
 manifests/vhost/redirect.pp  | 2 +-
 manifests/vhost/static.pp    | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'manifests/vhost')

diff --git a/manifests/vhost/gitweb.pp b/manifests/vhost/gitweb.pp
index 2bc15d0..3ac8243 100644
--- a/manifests/vhost/gitweb.pp
+++ b/manifests/vhost/gitweb.pp
@@ -37,7 +37,7 @@ define apache::vhost::gitweb(
             default => '/var/log/apache2'
         },
         logmode => $logmode,
-        template_mode => 'gitweb',
+        template_partial => 'apache/vhosts/gitweb/partial.erb',
         domain => $domain,
         domainalias => $domainalias,
         server_admin => $server_admin,
diff --git a/manifests/vhost/passenger.pp b/manifests/vhost/passenger.pp
index de3b162..5526125 100644
--- a/manifests/vhost/passenger.pp
+++ b/manifests/vhost/passenger.pp
@@ -21,7 +21,6 @@ define apache::vhost::passenger(
     $path = 'absent',
     $manage_webdir = true,
     $manage_docroot = true,
-    $template_mode = 'passenger',
     $owner = root,
     $group = apache,
     $documentroot_owner = apache,
@@ -107,7 +106,6 @@ define apache::vhost::passenger(
         ensure => $ensure,
         path => "${real_path}/www/public",
         path_is_webdir => true,
-        template_mode => $template_mode,
         template_partial => 'apache/vhosts/passenger/partial.erb',
         logmode => $logmode,
         logpath => "${real_path}/logs",
diff --git a/manifests/vhost/proxy.pp b/manifests/vhost/proxy.pp
index 5783b1f..113f4ef 100644
--- a/manifests/vhost/proxy.pp
+++ b/manifests/vhost/proxy.pp
@@ -38,7 +38,7 @@ define apache::vhost::proxy(
     # we use the options field as the target_url
     ::apache::vhost::template{$name:
         ensure => $ensure,
-        template_mode => 'proxy',
+        template_partial => 'apache/vhosts/proxy/partial.erb',
         domain => $domain,
         path => 'really_absent',
         path_is_webdir => true,
diff --git a/manifests/vhost/redirect.pp b/manifests/vhost/redirect.pp
index 9384fc0..3297279 100644
--- a/manifests/vhost/redirect.pp
+++ b/manifests/vhost/redirect.pp
@@ -32,7 +32,7 @@ define apache::vhost::redirect(
     # we use the options field as the target_url
     ::apache::vhost::template{$name:
         ensure => $ensure,
-        template_mode => 'redirect',
+        template_partial => 'apache/vhost/redirect/partial.erb',
         domain => $domain,
         path => 'really_absent',
         path_is_webdir => true,
diff --git a/manifests/vhost/static.pp b/manifests/vhost/static.pp
index 76e2bee..cd5ac77 100644
--- a/manifests/vhost/static.pp
+++ b/manifests/vhost/static.pp
@@ -57,7 +57,7 @@ define apache::vhost::static(
     ::apache::vhost{$name:
         ensure => $ensure,
         path => $path,
-        template_mode => 'static',
+        template_partial => 'apache/vhosts/static/partial.erb',
         vhost_mode => $vhost_mode,
         vhost_source => $vhost_source,
         vhost_destination => $vhost_destination,
-- 
cgit v1.2.3