Merge remote-tracking branch 'immerda/master'

Conflicts:
	manifests/host.pp
	manifests/host/cgi.pp
	manifests/plugin.pp
	manifests/plugin/deploy.pp
	manifests/plugins/apache.pp
	manifests/plugins/base.pp
	manifests/plugins/dom0.pp
	manifests/plugins/gentoo.pp
	manifests/plugins/interfaces.pp
	manifests/plugins/linux.pp
	manifests/plugins/openbsd.pp
	manifests/plugins/physical.pp
	manifests/plugins/selinux.pp
	manifests/plugins/vserver.pp

1 files changed, 6 insertions, 36 deletions

diff --git a/manifests/plugins/base.pp b/manifests/plugins/base.pp
index 64756bc..bfccae5 100644
--- a/manifests/plugins/base.pp
+++ b/manifests/plugins/base.pp
@@ -1,55 +1,25 @@
 class munin::plugins::base {
 
-  file {
-    [ '/etc/munin/plugins', '/etc/munin/plugin-conf.d' ]:
-      source => "puppet://$server/modules/common/empty",
-      ignore => [ '\.ignore', 'snmp_*' ],
-      ensure => directory, checksum => mtime,
-      recurse => true, purge => true, force => true,
-      mode => 0755, owner => root, group => 0,
-      notify => Service['munin-node'];
-
-    '/etc/munin/plugin-conf.d/munin-node':
-      ensure => present,
-      mode => 0644, owner => root, group => 0,
-      notify => Service['munin-node'],
-  }
-
+  # setup basic plugins
   munin::plugin {
     [ df, cpu, interrupts, load, memory, netstat, open_files,
-      processes, swap, uptime, vmstat ]:
-        ensure => present,
+      processes, swap, uptime, users, vmstat ]:
+            ensure => present,
   }
-  
   include munin::plugins::interfaces
 
   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'],
-      }
-    }
-  }
-  
-  case $kernel {
+    openbsd: { include munin::plugins::openbsd }
     linux: {
       case $vserver {
         guest: { include munin::plugins::vserver }
-        default: {
-          include munin::plugins::linux
-        }
+        default: { include munin::plugins::linux }
       }
     }
   }
-  
+        
   case $virtual {
     physical: { include munin::plugins::physical }
     xen0: { include munin::plugins::dom0 }
   }
-  
 }