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, 4 insertions, 17 deletions

diff --git a/manifests/plugins/setup.pp b/manifests/plugins/setup.pp
index 197b657..a3f3b22 100644
--- a/manifests/plugins/setup.pp
+++ b/manifests/plugins/setup.pp
@@ -1,14 +1,13 @@
+# Set up the munin plugins for a node
 class munin::plugins::setup {
 
-  # This is required for the munin-node service and package requirements below.
-  include munin::client
-
   file {
     [ '/etc/munin/plugins', '/etc/munin/plugin-conf.d' ]:
-      ignore    => 'snmp_*',
       ensure    => directory,
+      require   => Package['munin-node'],
+      ignore    => 'snmp_*',
       checksum  => mtime,
-      recurse 	=> true,
+      recurse   => true,
       purge     => true,
       force     => true,
       notify    => Service['munin-node'],
@@ -22,16 +21,4 @@ class munin::plugins::setup {
       group     => 0,
       mode      => '0640';
   }
-  case $::kernel {
-    openbsd: {
-      File['/etc/munin/plugin-conf.d/munin-node']{
-        before => File['/var/run/munin'],
-      }
-    }
-    default: {
-      File['/etc/munin/plugin-conf.d/munin-node']{
-        before => Package['munin-node'],
-      }
-    }
-  }
 }