X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin-node%2Fmanifests%2Finit.pp;h=c3b4a1236a3a4cb6890881be1984daec0216b5d8;hb=af15aa804d934145160f1860fe7a5df49d7c133a;hp=587f15774cc93b90536ea4c8596b044742d23752;hpb=36c4109ac25d8552165f8a3779461d1bf52a1d25;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 587f15774..c3b4a1236 100644
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -1,4 +1,4 @@
-define activate_munin_check($ensure=present, script=$name) {
+define activate_munin_check($ensure=present, $script=$name) {
     case $script {
         "": { $base = $name }
         default: { $base = $script }
@@ -37,6 +37,7 @@ class munin-node {
         "load":;
         "memory":;
         "ntp_offset":;
+        "ntp_states":;
         "open_files":;
         "open_inodes":;
         "processes":;
@@ -45,16 +46,39 @@ class munin-node {
         "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-node from spohr.debian.org",
+        rule            => "proto tcp dport 4949 saddr $HOST_MUNIN ACCEPT",
+	prio		=> "02"
+   }
 }