X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin-node%2Fmanifests%2Finit.pp;h=5ddbf6eb3d86c1150cf5f08719be8bf94c14effe;hb=c14d0a7356dc1222c88e9a7d4f4112c057f0c79f;hp=698899cf8b14dbae6fef5713849dc294484e215d;hpb=162e4df691c0765b962b547feefcbdbfe0198f9b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 698899cf8..5ddbf6eb3 100644
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -1,8 +1,13 @@
-define activate_munin_check($ensure=present) {
+define activate_munin_check($ensure=present, $script = none) {
+    case $script {
+        none: { $link = $name }
+        default: { $link = $script }
+    }
+
     case $ensure {
         present: {
             file { "/etc/munin/plugins/$name":
-                     ensure => "/usr/share/munin/plugins/$name",
+                     ensure => "/usr/share/munin/plugins/$link",
                      notify => Exec["munin-node restart"];
             }
         }
@@ -12,6 +17,7 @@ define activate_munin_check($ensure=present) {
                      notify => Exec["munin-node restart"];
             }
         }
+    }
 }
 
 class munin-node {
@@ -21,6 +27,7 @@ class munin-node {
     activate_munin_check {
         "cpu":;
         "df":;
+        "df_abs":;
         "df_inode":;
         "entropy":;
         "forks":;
@@ -30,23 +37,47 @@ class munin-node {
         "load":;
         "memory":;
         "ntp_offset":;
+        "ntp_states":;
         "open_files":;
         "open_inodes":;
         "processes":;
         "swap":;
+        "uptime":;
         "vmstat":;
     }
 
-    file { "/etc/munin/munin-node.conf":
-        source  => [ "puppet:///munin-node/per-host/$fqdn/munin-node.conf",
-                     "puppet:///munin-node/common/munin-node.conf" ],
-        require => Package["munin-node"],
-        notify  => Exec["munin-node restart"],
+    case $spamd {
+        "true": {
+              activate_munin_check { "spamassassin":; }
+        }
+    }
+
+    case $vsftpd {
+        "true": {
+              include munin-node::vsftpd
+        }
+    }
+
+    file {
+        "/etc/munin/munin-node.conf":
+            source  => [ "puppet:///munin-node/per-host/$fqdn/munin-node.conf",
+                         "puppet:///munin-node/common/munin-node.conf" ],
+            require => Package["munin-node"],
+            notify  => Exec["munin-node restart"];
+
+        "/etc/munin/plugin-conf.d/munin-node":
+            content => template("munin-node/munin-node.plugin.conf.erb"),
+            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,
     }
+    @ferm::rule { "dsa-munin":
+            description     => "Allow munin from munin master",
+            rule            => "proto tcp mod state state (NEW) dport (munin) @subchain 'munin' { saddr (\$HOST_MUNIN) ACCEPT; }"
+    }
 }