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

diff --git a/manifests/plugins/base.pp b/manifests/plugins/base.pp
index c6b88ed..33cd84d 100644
--- a/manifests/plugins/base.pp
+++ b/manifests/plugins/base.pp
@@ -1,29 +1,33 @@
+# A basic set of plugins
 class munin::plugins::base {
   # setup basic plugins
   munin::plugin {
-    [ df, cpu, interrupts, load, memory, netstat, open_files,
-      processes, swap, uptime, users, vmstat ]:
+    [ 'df', 'cpu', 'interrupts', 'load', 'memory', 'netstat', 'open_files',
+      'processes', 'swap', 'uptime', 'users', 'vmstat' ]:
             ensure => present,
   }
   file{'/etc/munin/plugin-conf.d/df':
     content => "[df*]\nenv.exclude none unknown iso9660 squashfs udf romfs ramfs debugfs binfmt_misc rpc_pipefs fuse.gvfs-fuse-daemon\n",
-    require => Munin::Plugin[df],
-    owner => root, group => 0, mode => 0644;
+    require => Munin::Plugin['df'],
+    owner   => 'root',
+    group   => 0,
+    mode    => '0644',
   }
   include munin::plugins::interfaces
 
   case $::kernel {
     openbsd: { include munin::plugins::openbsd }
     linux: {
-      case $vserver {
+      case $::vserver {
         guest: { include munin::plugins::vserver }
         default: { include munin::plugins::linux }
       }
     }
   }
-        
+
   case $::virtual {
     physical: { include munin::plugins::physical }
     xen0: { include munin::plugins::dom0 }
+    default: { }
   }
 }