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, 9 insertions, 7 deletions

diff --git a/manifests/register.pp b/manifests/register.pp
index 309c322..8c1ec61 100644
--- a/manifests/register.pp
+++ b/manifests/register.pp
@@ -1,10 +1,12 @@
+# Register a munin client
 define munin::register (
-  $host = $::fqdn,
-  $port = '4949',
-  $use_ssh = false,
-  $description = 'absent',
-  $config = [],
-  $export_tag = 'munin'
+  $host         = $::fqdn,
+  $port         = '4949',
+  $use_ssh      = false,
+  $description  = 'absent',
+  $config       = [],
+  $export_tag   = 'munin',
+  $group        = 'absent',
 )
 {
   $fhost = $name
@@ -12,7 +14,7 @@ define munin::register (
 
   @@concat::fragment{ "munin_client_${fhost}_${port}":
     target  => '/etc/munin/munin.conf',
-    content => template("munin/client.erb"),
+    content => template('munin/client.erb'),
     tag     => $export_tag,
   }
 }