summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--templates/client.erb24
-rw-r--r--templates/munin-node.conf.default2
-rw-r--r--templates/site.conf2
3 files changed, 14 insertions, 14 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 -%>
diff --git a/templates/munin-node.conf.default b/templates/munin-node.conf.default
index cb9cf43..dc7c4fc 100644
--- a/templates/munin-node.conf.default
+++ b/templates/munin-node.conf.default
@@ -38,7 +38,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