From c2eb31850777a49991e35a9008e589e51e0eee0f Mon Sep 17 00:00:00 2001 From: Marcel Haerry Date: Thu, 4 Aug 2011 11:00:42 +0200 Subject: get a new line at the end --- templates/client.erb | 1 + 1 file changed, 1 insertion(+) (limited to 'templates/client.erb') diff --git a/templates/client.erb b/templates/client.erb index 15e05c6..3e8ab39 100644 --- a/templates/client.erb +++ b/templates/client.erb @@ -17,3 +17,4 @@ <% if config -%><% config.each do |val| -%> <%= val -%> <% end -%><% end -%> + -- cgit v1.2.3 From e2dfae5852ecdf3695a6af8ec48092ea24698390 Mon Sep 17 00:00:00 2001 From: "Christian G. Warden" Date: Thu, 2 Feb 2012 18:10:14 -0800 Subject: Fully qualify facter variables --- templates/client.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates/client.erb') diff --git a/templates/client.erb b/templates/client.erb index 3e8ab39..8c93cc5 100644 --- a/templates/client.erb +++ b/templates/client.erb @@ -1,7 +1,7 @@ <% # Downcase all information - dom = domain.downcase - host = hostname.downcase + dom = scope.lookupvar('::domain').downcase + host = scope.lookupvar('::hostname').downcase %> ### Munin client from Puppet template -- cgit v1.2.3 From c95f0b2fcf4f35b1a7ae3ad9c04600a32ab2bb43 Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 13 Jun 2012 20:40:57 -0300 Subject: migrate away from hiera stuff --- templates/client.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'templates/client.erb') diff --git a/templates/client.erb b/templates/client.erb index 8c93cc5..7131ade 100644 --- a/templates/client.erb +++ b/templates/client.erb @@ -1,19 +1,19 @@ <% # Downcase all information dom = scope.lookupvar('::domain').downcase - host = scope.lookupvar('::hostname').downcase + h = scope.lookupvar('::hostname').downcase %> ### Munin client from Puppet template # Domain: <%= dom %> -# Registered on: <%= host %> +# Registered on: <%= h %> # Type: <%= client_type %> <% if description != 'absent' -%> # Description: <%= description.gsub!(/\n/, ' ') %> <% end -%> [<%= fhost.downcase %>] - address <%= munin_host_real %> - port <%= munin_port_real %> + address <%= host %> + port <%= port %> <% if config -%><% config.each do |val| -%> <%= val -%> <% end -%><% end -%> -- cgit v1.2.3 From a2004f577c2e15d9b6cf482f0693601f43c43fad Mon Sep 17 00:00:00 2001 From: Markus Heberling Date: Wed, 23 Jan 2013 20:15:52 +0100 Subject: added support for use_ssh for munin 2.0 --- templates/client.erb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'templates/client.erb') diff --git a/templates/client.erb b/templates/client.erb index 7131ade..ba03da5 100644 --- a/templates/client.erb +++ b/templates/client.erb @@ -12,8 +12,12 @@ # Description: <%= description.gsub!(/\n/, ' ') %> <% end -%> [<%= fhost.downcase %>] +<% if use_ssh -%> + address ssh://<%= host %>/bin/nc localhost <%= port %> +<% else -%> address <%= host %> port <%= port %> +<% end -%> <% if config -%><% config.each do |val| -%> <%= val -%> <% end -%><% end -%> -- cgit v1.2.3