summaryrefslogtreecommitdiff
path: root/templates/client.erb
diff options
context:
space:
mode:
authorGabriel Filion <gabster@lelutin.ca>2014-12-13 09:34:56 -0500
committerGabriel Filion <gabster@lelutin.ca>2014-12-13 10:21:25 -0500
commit48272434978f95c70e34aebe9ce188157f8f935e (patch)
tree8c940d891cbcba026d56cf8ed2935361debc44fd /templates/client.erb
parent7e03247a9e219fe8e57d544957eb06e305e69fc1 (diff)
parent27c9a5dbc2083dcc20d059008702dd3f75382bcc (diff)
Merge remote-tracking branch 'immerda/master' into merge_immerda
Conflicts: manifests/plugins/interfaces.pp $real_ifs was changed on master and we'd like to keep that change $ifs was changed to use the prefix() function and we'd like to keep that change.
Diffstat (limited to 'templates/client.erb')
-rw-r--r--templates/client.erb26
1 files changed, 13 insertions, 13 deletions
diff --git a/templates/client.erb b/templates/client.erb
index ba03da5..bc42452 100644
--- a/templates/client.erb
+++ b/templates/client.erb
@@ -1,24 +1,24 @@
<%
- # Downcase all information
- dom = scope.lookupvar('::domain').downcase
- h = scope.lookupvar('::hostname').downcase
+ # Downcase all information
+ dom = scope.lookupvar('::domain').downcase
+ h = scope.lookupvar('::hostname').downcase
%>
### Munin client from Puppet template
# Domain: <%= dom %>
# Registered on: <%= h %>
-# Type: <%= client_type %>
-<% if description != 'absent' -%>
-# Description: <%= description.gsub!(/\n/, ' ') %>
+# Type: <%= @client_type %>
+<% if @description != 'absent' -%>
+# Description: <%= @description.gsub(/\n/, ' ') %>
<% end -%>
-[<%= fhost.downcase %>]
-<% if use_ssh -%>
- address ssh://<%= host %>/bin/nc localhost <%= port %>
+[<% if @group != 'absent' -%><%= @group %>;<% end -%><%= @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 -%>