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

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 020b82700..29bef07fe 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 }
@@ -52,6 +52,12 @@ class munin-node {
         }
     }
 
+    case $vsftpd {
+        "true": {
+              include munin-node::vsftpd
+        }
+    }
+
     file {
         "/etc/munin/munin-node.conf":
             source  => [ "puppet:///munin-node/per-host/$fqdn/munin-node.conf",
@@ -60,7 +66,7 @@ class munin-node {
             notify  => Exec["munin-node restart"];
 
         "/etc/munin/plugin-conf.d/munin-node":
-            content => template("munin/munin-node.plugin.conf.erb"),
+            content => template("munin-node/munin-node.plugin.conf.erb"),
             require => Package["munin-node"],
             notify  => Exec["munin-node restart"];
     }