From 2fa748dcc92e34b13bd4b6f7e452ef89b29490c4 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sat, 8 Oct 2011 19:22:40 +0200
Subject: introduce a new template style, less duplicated things, more handy
 options

---
 templates/vhosts/itk_plus.erb | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 templates/vhosts/itk_plus.erb

(limited to 'templates/vhosts/itk_plus.erb')

diff --git a/templates/vhosts/itk_plus.erb b/templates/vhosts/itk_plus.erb
new file mode 100644
index 0000000..2890ecf
--- /dev/null
+++ b/templates/vhosts/itk_plus.erb
@@ -0,0 +1,10 @@
+<IfDefine HttpdLocal>
+<%= 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') %>
+</IfDefine>
\ No newline at end of file
-- 
cgit v1.2.3


From 9cbf2fafee3f4623b75d1a6b70458ab097e64924 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 8 Jun 2012 12:09:39 -0300
Subject: fix dynamic scope variables, function access

---
 templates/vhosts/itk_plus.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'templates/vhosts/itk_plus.erb')

diff --git a/templates/vhosts/itk_plus.erb b/templates/vhosts/itk_plus.erb
index 2890ecf..b7cb180 100644
--- a/templates/vhosts/itk_plus.erb
+++ b/templates/vhosts/itk_plus.erb
@@ -1,10 +1,10 @@
 <IfDefine HttpdLocal>
-<%= scope.function_template('apache/vhost/default.erb') %>
+<%= 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') %>
-</IfDefine>
\ No newline at end of file
+<%= scope.function_template(['apache/vhost/default.erb']) %>
+</IfDefine>
-- 
cgit v1.2.3


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/itk_plus.erb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'templates/vhosts/itk_plus.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