Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

[mirror/dsa-puppet.git] / modules / samhain / templates / samhainrc.erb

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index b8a80db..574ee8d 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -262,6 +262,8 @@ file=/etc/clamav-unofficial-sigs.dsa.conf
 end
 out
 %>
+file=/etc/munin/plugins/bind
+file=/etc/munin/plugins/bind_views
 file=/etc/munin/plugins/cpu
 file=/etc/munin/plugins/df
 file=/etc/munin/plugins/df_abs
@@ -279,7 +281,9 @@ 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_exim4
 file=/etc/munin/plugins/ps_vsftpd
+file=/etc/munin/plugins/spamassassin
 file=/etc/munin/plugins/swap
 file=/etc/munin/plugins/uptime
 file=/etc/munin/plugins/vmstat
@@ -287,6 +291,7 @@ file=/etc/munin/plugins/vfstpd
 file=/etc/munin/plugins/apache_accesses
 file=/etc/munin/plugins/apache_processes
 file=/etc/munin/plugins/apache_volume
+file=/etc/munin/plugins/apache_servers
 file=/etc/munin/plugins/exim_mailqueue
 file=/etc/munin/plugins/exim_mailstats
 file=/etc/munin/plugins/postfix_mailqueue