Merge branch 'merge_immerda' into 'master'

This is my attempt at merging the huge backlog of commits from immerda. I've been pretty verbose about it in redmine so I won't repeat it all here. For details, see:

https://labs.riseup.net/code/issues/4132

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