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, 6 deletions

diff --git a/manifests/remoteplugin.pp b/manifests/remoteplugin.pp
index 603cb66..dc03c76 100644
--- a/manifests/remoteplugin.pp
+++ b/manifests/remoteplugin.pp
@@ -1,16 +1,23 @@
-define munin::remoteplugin($ensure = "present", $source, $config = '') {
+# Configure a munin remote plugin
+define munin::remoteplugin(
+  $source,
+  $ensure = 'present',
+  $config = ''
+) {
   case $ensure {
-    "absent": { munin::plugin{ $name: ensure => absent } }
+    'absent': { munin::plugin{ $name: ensure => absent } }
     default: {
       file {
         "/var/lib/puppet/modules/munin/plugins/${name}":
           source => $source,
-          mode => 0755, owner => root, group => 0;
+          mode   => '0755',
+          owner  => root,
+          group  => 0,
       }
       munin::plugin { $name:
-        ensure => $ensure,
-        config => $config,
-        script_path_in => "/var/lib/puppet/modules/munin/plugins",
+        ensure         => $ensure,
+        config         => $config,
+        script_path_in => '/var/lib/puppet/modules/munin/plugins',
       }
     }
   }