X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin-node%2Fmanifests%2Finit.pp;h=59fe205abfa59e1a1c11b0b82df4dd3a0e268114;hb=cab61105c047ee9d4f521b65eaebf1e0f6e9e736;hp=29bef07fef85f8b3fae7be4f6dcf80cc72a70ca4;hpb=d786f4ec40f28a617b962f753c1350e924f91f52;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 29bef07fe..59fe205ab 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"];
             }
         }
@@ -54,14 +54,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"];
 
@@ -75,5 +80,14 @@ class munin-node {
         path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }
+    @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; }"
+    }
+    @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; }"
+    }
 }