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, 27 insertions, 0 deletions

diff --git a/manifests/plugins/setup.pp b/manifests/plugins/setup.pp
new file mode 100644
index 0000000..c2c5ed3
--- /dev/null
+++ b/manifests/plugins/setup.pp
@@ -0,0 +1,27 @@
+class munin::plugins::setup {
+  file {
+    [ '/etc/munin/plugins', '/etc/munin/plugin-conf.d' ]:
+      source => "puppet:///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'],
+  }
+  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'],
+      }
+    }
+  }
+}