Merge branch 'master' into leap

Conflicts:
	README
	README.pnp4nagios
	manifests/defaults/pnp4nagios.pp
	manifests/munin.pp
	manifests/pnp4nagios.pp
	manifests/pnp4nagios/popup.pp

1 files changed, 16 insertions, 25 deletions

diff --git a/manifests/munin.pp b/manifests/munin.pp
index 490b016..dc5cc4c 100644
--- a/manifests/munin.pp
+++ b/manifests/munin.pp
@@ -1,28 +1,19 @@
-class nagios::munin inherits munin::plugins::base {
+class nagios::munin {
+  include munin::plugins::base
 
-    munin::plugin::deploy {
-        nagios_hosts:
-            source => 'nagios/munin/nagios_hosts',
-            config => 'user root';
-        nagios_svc:
-            source => 'nagios/munin/nagios_svc',
-            config => 'user root';
-        nagios_perf_hosts:
-            source => 'nagios/munin/nagios_perf',
-            config => 'user root';
-        nagios_perf_svc:
-            source => 'nagios/munin/nagios_perf',
-            config => 'user root';
-    }
-
-    exec { 'munin_nagios2stats_link':
-        command => 'ln -s /usr/sbin/nagios2stats /usr/local/sbin/nagiostats',
-        onlyif => ["/usr/bin/test ! -e /usr/local/sbin/nagiostats", "/usr/bin/test -e /usr/sbin/nagios2stats"],
-    }
-
-    exec { 'munin_nagios3stats_link':
-        command => 'ln -s /usr/sbin/nagios3stats /usr/local/sbin/nagiostats',
-        onlyif => ["/usr/bin/test ! -e /usr/local/sbin/nagiostats", "/usr/bin/test -e /usr/sbin/nagios3stats"],
-    }
+  munin::plugin::deploy {
+    'nagios_hosts':
+      source => 'nagios/munin/nagios_hosts',
+      config => 'user nagios';
+    'nagios_svc':
+      source => 'nagios/munin/nagios_svc',
+      config => 'user nagios';
+    'nagios_perf_hosts':
+      source => 'nagios/munin/nagios_perf',
+      config => 'user nagios';
+    'nagios_perf_svc':
+      source => 'nagios/munin/nagios_perf',
+      config => 'user nagios';
+  }
 
 }