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

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 947774334..5ddbf6eb3 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"];
             }
         }
@@ -37,6 +37,7 @@ class munin-node {
         "load":;
         "memory":;
         "ntp_offset":;
+        "ntp_states":;
         "open_files":;
         "open_inodes":;
         "processes":;
@@ -45,23 +46,38 @@ class munin-node {
         "vmstat":;
     }
 
+    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"],
+            notify  => Exec["munin-node restart"];
 
         "/etc/munin/plugin-conf.d/munin-node":
-            source  => [ "puppet:///munin-node/per-host/$fqdn/munin-node.plugin.conf",
-                         "puppet:///munin-node/common/munin-node.plugin.conf" ],
+            content => template("munin-node/munin-node.plugin.conf.erb"),
             require => Package["munin-node"],
-            notify  => Exec["munin-node restart"],
+            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; }"
+    }
 }