some samhain addtions and tidy up

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

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 677a2ee..5332081 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -114,6 +114,7 @@ file=/etc/apache2/conf.d
 files=/etc/apache2/mods-enabled
 file=/etc/samhain
 file=/etc/munin
+file=/etc/munin/plugins
 file=/etc/exim4
 file=/etc/exim4/ssl
 file=/etc/apt
@@ -135,7 +136,6 @@ extradir
 %>
 file=/etc/cron.d
 file=/usr/lib/nagios/plugins
-file=/etc/munin/plugins
 file=/usr/sbin
 file=/etc/monit
 file=/etc/monit/monit.d
@@ -260,16 +260,21 @@ file=/etc/clamav-unofficial-sigs.dsa.conf
 end
 out
 %>
-files=/etc/munin/plugins/apache_accesses
-files=/etc/munin/plugins/apache_processes
-files=/etc/munin/plugins/apache_volume
+file=/etc/munin/plugins/apache_accesses
+file=/etc/munin/plugins/apache_processes
+file=/etc/munin/plugins/apache_volume
+file=/etc/munin/plugins/df_abs
+file=/etc/munin/plugins/exim_mailqueue
+file=/etc/munin/plugins/exim_mailstats
+file=/etc/munin/plugins/postfix_mailqueue
+file=/etc/munin/plugins/postfix_mailvolume
 file=/etc/apache2/conf.d/ressource-limits
-files=/etc/apache2/mods-enabled/info.conf
-files=/etc/apache2/mods-enabled/info.load
-files=/etc/apache2/mods-enabled/server.conf
-files=/etc/apache2/mods-enabled/server.load
-files=/etc/apache2/conf.d/server-status
-files=/etc/apache2/conf.d/local-serverinfo
+file=/etc/apache2/mods-enabled/info.conf
+file=/etc/apache2/mods-enabled/info.load
+file=/etc/apache2/mods-enabled/server.conf
+file=/etc/apache2/mods-enabled/server.load
+file=/etc/apache2/conf.d/server-status
+file=/etc/apache2/conf.d/local-serverinfo
 file=/etc/apt/preferences
 file=/etc/apt/sources.list.d/volatile.list
 file=/etc/apt/sources.list.d/security.list