From: Stephen Gran <steve@lobefin.net>
Date: Sat, 17 Oct 2009 16:47:23 +0000 (+0100)
Subject: add vsftpd module, even though no one uses it yet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=55ac3e7bcfed650a7644596a82cbd6439fdbb4a9;p=mirror%2Fdsa-puppet.git

add vsftpd module, even though no one uses it yet

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/munin-node/manifests/vsftpd.pp b/modules/munin-node/manifests/vsftpd.pp
new file mode 100644
index 000000000..7922ac9e2
--- /dev/null
+++ b/modules/munin-node/manifests/vsftpd.pp
@@ -0,0 +1,7 @@
+class munin-node::vsftpd inherits munin-node {
+        activate_munin_check {
+                "vsftpd":;
+                "ps_vsftpd": script => "ps_";
+        }
+}
+
diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index be36383ac..30d3a85dc 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -278,9 +278,11 @@ file=/etc/munin/plugins/open_files
 file=/etc/munin/plugins/open_inodes
 file=/etc/munin/plugins/processes
 file=/etc/munin/plugins/ps_apache2
+file=/etc/munin/plugins/ps_vsftpd
 file=/etc/munin/plugins/swap
 file=/etc/munin/plugins/uptime
 file=/etc/munin/plugins/vmstat
+file=/etc/munin/plugins/vfstpd
 file=/etc/munin/plugins/apache_accesses
 file=/etc/munin/plugins/apache_processes
 file=/etc/munin/plugins/apache_volume