X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin-node%2Fmanifests%2Finit.pp;h=72dbce1cbde6b398f5befb26faacb6412a71860e;hb=dc407ae509b2b84ef6de08f6037dba4457d00c0c;hp=cde57774f82322e39bd06999c820feb66e055d3a;hpb=7f86914b9cb237cb1cf8c720f86902bef717cfaa;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index cde57774f..72dbce1cb 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-node/df-wrap",
+            mode    => 555,
+            require => Package["munin-node"],
+            notify  => Exec["munin-node restart"]
+            ;
+        "/etc/munin/plugins/df_abs":
+            source  => "puppet:///modules/munin-node/df-wrap",
+            mode    => 555,
+            require => Package["munin-node"],
+            notify  => Exec["munin-node restart"]
+            ;
+        "/etc/munin/plugins/df_inode":
+            source  => "puppet:///modules/munin-node/df-wrap",
+            mode    => 555,
+            require => Package["munin-node"],
+            notify  => Exec["munin-node restart"]
+            ;
     }
 
     exec { "munin-node restart":
@@ -82,12 +98,14 @@ class munin-node {
     }
     @ferm::rule { "dsa-munin-v4":
             description     => "Allow munin from munin master",
-            rule            => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN_V4 \$HOST_NAGIOS_V4) ACCEPT; }"
+            rule            => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN_V4 \$HOST_NAGIOS_V4) ACCEPT; }",
+            notarule        => true,
     }
     @ferm::rule { "dsa-munin-v6":
             description     => "Allow munin from munin master",
             domain          => "ip6",
-            rule            => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN_V6 \$HOST_NAGIOS_V6) ACCEPT; }"
+            rule            => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN_V6 \$HOST_NAGIOS_V6) ACCEPT; }",
+            notarule        => true,
     }
 }