X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fmunin-node%2Fmanifests%2Finit.pp;h=72dbce1cbde6b398f5befb26faacb6412a71860e;hb=103df6353b04261dda4f6db60925961f0a9cce5c;hp=9b40cf965cf648320682e9a6cd0af85f377d3e74;hpb=d84d5dd1f67e16cf54c531cab8cd267bdfd97429;p=dsa-puppet.git

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 9b40cf96..72dbce1c 100644
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -1,13 +1,13 @@
-define activate_munin_check($ensure=present, $script=$name) {
+define activate_munin_check($ensure=present, $script = none) {
     case $script {
-        "": { $base = $name }
-        default: { $base = $script }
+        none: { $link = $name }
+        default: { $link = $script }
     }
 
     case $ensure {
         present: {
             file { "/etc/munin/plugins/$name":
-                     ensure => "/usr/share/munin/plugins/$base",
+                     ensure => "/usr/share/munin/plugins/$link",
                      notify => Exec["munin-node restart"];
             }
         }
@@ -26,9 +26,6 @@ class munin-node {
 
     activate_munin_check {
         "cpu":;
-        "df":;
-        "df_abs":;
-        "df_inode":;
         "entropy":;
         "forks":;
         "interrupts":;
@@ -54,14 +51,19 @@ class munin-node {
 
     case $vsftpd {
         "true": {
-              include munin-node::vsftpd
+              package { 
+                      "logtail": ensure => installed;
+              }
+              activate_munin_check {
+                      "vsftpd":;
+                      "ps_vsftpd": script => "ps_";
+              }
         }
     }
 
     file {
         "/etc/munin/munin-node.conf":
-            source  => [ "puppet:///munin-node/per-host/$fqdn/munin-node.conf",
-                         "puppet:///munin-node/common/munin-node.conf" ],
+            content => template("munin-node/munin-node.conf.erb"),
             require => Package["munin-node"],
             notify  => Exec["munin-node restart"];
 
@@ -69,20 +71,44 @@ 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":
         path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }
-    case $ferm {
-	"true": {
-	    ferm::rule { "dsa-munin":
-		description     => "Allow munin-node from spohr.debian.org",
-		rule            => 'proto tcp dport 4949 saddr $HOST_MUNIN ACCEPT',
-		prio		=> "02"
-	   }
-	}
-   }
+    @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; }",
+            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; }",
+            notarule        => true,
+    }
 }
 
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: