From 2671311f38f8891d76b55c08d5ea1b2d9599ecad Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 20 Mar 2013 21:51:36 +0100
Subject: make things puppet 3 ready

---
 templates/vhosts/default.erb  | 9 +++------
 templates/vhosts/itk_plus.erb | 6 +-----
 2 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'templates')

diff --git a/templates/vhosts/default.erb b/templates/vhosts/default.erb
index 62edf69..809cd9b 100644
--- a/templates/vhosts/default.erb
+++ b/templates/vhosts/default.erb
@@ -4,13 +4,10 @@ vhost_parts = case ssl_mode
   when false,'false' then  [:normal]
   else [:normal,:ssl]
 end
-vhost_parts.each do |vhost_part|
-  scope.unsetvar('vhost_part')
-  scope.setvar('vhost_part',vhost_part)
--%>
+vhost_parts.each do |vhost_part| -%>
 <VirtualHost *:<%= vhost_part == :ssl ? '443' : '80' %> >
 
-<%= scope.function_template(['apache/vhosts/partials/header_default.erb']) %>
+<%= scope.function_templatewlv(['apache/vhosts/partials/header_default.erb', {'vhost_part' => vhost_part } ]) %>
 
 <%= scope.function_template(['apache/vhosts/partials/logs.erb']) %>
 
@@ -33,7 +30,7 @@ vhost_parts.each do |vhost_part|
   RewriteCond %{HTTPS} !=on
   RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
   <% else -%>
-<%= scope.function_template([template_partial]) %>
+<%= scope.function_templatewlv([template_partial, {'vhost_part' => vhost_part } ]) %>
   <% end -%>
 <%- unless template_partial == 'apache/vhosts/itk_plus/partial.erb' -%>
 <%= scope.function_template(['apache/vhosts/partials/mod_security.erb']) %>
diff --git a/templates/vhosts/itk_plus.erb b/templates/vhosts/itk_plus.erb
index b7cb180..b546196 100644
--- a/templates/vhosts/itk_plus.erb
+++ b/templates/vhosts/itk_plus.erb
@@ -2,9 +2,5 @@
 <%= scope.function_template(['apache/vhost/default.erb']) %>
 </IfDefine>
 <IfDefine !HttpdLocal>
-<%
-  scope.unsetvar('template_partial')
-  scope.setvar('template_partial','apache/vhosts/itk_plus/partial.erb')
--%>
-<%= scope.function_template(['apache/vhost/default.erb']) %>
+<%= scope.function_templatewlv(['apache/vhost/default.erb', {'template_partial' => 'apache/vhosts/itk_plus/partial.erb' }]) %>
 </IfDefine>
-- 
cgit v1.2.3