From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 10 Dec 2011 20:09:55 +0000 (+0100)
Subject: Replace df* checks with wrapper
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=96a47d904647a3ae483656532c0300d85d5e56af;p=mirror%2Fdsa-puppet.git

Replace df* checks with wrapper
---

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index ab177817e..39f2dc614 100644
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -26,9 +26,6 @@ class munin-node {
 
     activate_munin_check {
         "cpu":;
-        "df":;
-        "df_abs":;
-        "df_inode":;
         "entropy":;
         "forks":;
         "interrupts":;
@@ -74,6 +71,25 @@ class munin-node {
             content => template("munin-node/munin-node.plugin.conf.erb"),
             require => Package["munin-node"],
             notify  => Exec["munin-node restart"];
+
+        "/etc/munin/plugins/df":
+            source  => "puppet:///modules/munin/df-wrap",
+            mode    => 555,
+            require => Package["munin-node"],
+            notify  => Exec["munin-node restart"]
+            ;
+        "/etc/munin/plugins/df_abs":
+            source  => "puppet:///modules/munin/df-wrap",
+            mode    => 555,
+            require => Package["munin-node"],
+            notify  => Exec["munin-node restart"]
+            ;
+        "/etc/munin/plugins/df_inode":
+            source  => "puppet:///modules/munin/df-wrap",
+            mode    => 555,
+            require => Package["munin-node"],
+            notify  => Exec["munin-node restart"]
+            ;
     }
 
     exec { "munin-node restart":