Merge remote-tracking branch 'github/master'

1 files changed, 12 insertions, 12 deletions

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 -%>