From 02a8971459a201b9165909593c250122b0c06c1b Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Mon, 3 Jun 2013 14:24:20 +0200
Subject: Use @var style for puppet 3.2 compatibility

---
 templates/client.erb              | 24 ++++++++++++------------
 templates/munin-node.conf.default |  2 +-
 templates/site.conf               |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'templates')

diff --git a/templates/client.erb b/templates/client.erb
index ba03da5..83d5a64 100644
--- a/templates/client.erb
+++ b/templates/client.erb
@@ -5,20 +5,20 @@
 %>
 
 ### Munin client from Puppet template
-# Domain: <%= dom %>
-# Registered on: <%= h %>
-# Type: <%= client_type %>
-<% if description != 'absent' -%>
-# Description: <%= description.gsub!(/\n/, ' ') %>
+# Domain: <%= @dom %>
+# Registered on: <%= @h %>
+# Type: <%= @client_type %>
+<% if @description != 'absent' -%>
+# Description: <%= @description.gsub!(/\n/, ' ') %>
 <% end -%>
-[<%= fhost.downcase %>]
-<% if use_ssh -%>
-    address ssh://<%= host %>/bin/nc localhost <%= port %>
+[<%= @fhost.downcase %>]
+<% if @use_ssh -%>
+    address ssh://<%= @host %>/bin/nc localhost <%= @port %>
 <% else -%>
-    address <%= host %>
-    port <%= port %>
+    address <%= @host %>
+    port <%= @port %>
 <% end -%>
-<% if config -%><% config.each do |val| -%> 
-    <%= val -%>
+<% if @config -%><% @config.each do |val| -%>
+    <%= @val -%>
 <% end -%><% end -%>
 
diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default
index 9d7f32f..cff7154 100644
--- a/templates/munin-node.conf.default
+++ b/templates/munin-node.conf.default
@@ -28,7 +28,7 @@ ignore_file \.pod$
 # telnetting to localhost, port 4949
 #
 #host_name localhost.localdomain
-host_name <%= fqdn %>
+host_name <%= @fqdn %>
 
 # A list of addresses that are allowed to connect.  This must be a
 # regular expression, since Net::Server does not understand CIDR-style
diff --git a/templates/site.conf b/templates/site.conf
index 52ddb53..842bde0 100644
--- a/templates/site.conf
+++ b/templates/site.conf
@@ -1,5 +1,5 @@
 <VirtualHost *>
-	ServerName <%= name %>
+	ServerName <%= @name %>
 	DocumentRoot /var/cache/munin/www/
 	<Location />
 		order allow,deny
-- 
cgit v1.2.3