X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=e99822a2189f651165bb68b22edebb427b44df7d;hb=73d89b3219cb1009f5a7489e624d8d0f9f1463ac;hp=60e0b2c7dd03caade5323741c1f7405beaff767b;hpb=02f92c33aaf8504fcc3e40375bd1e5adf7297d93;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 60e0b2c7d..e99822a21 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -115,6 +115,7 @@ files=/etc/apache2/mods-enabled
 file=/etc/samhain
 file=/etc/munin
 file=/etc/munin/plugins
+file=/etc/munin/plugin-conf.d
 file=/etc/exim4
 file=/etc/exim4/ssl
 file=/etc/apt
@@ -224,6 +225,7 @@ file=/etc/motd.tail
 file=/etc/ntp.conf
 file=/etc/samhain/samhainrc
 file=/etc/munin/munin-node.conf
+file=/etc/munin/plugin-conf.d/munin-node
 file=/etc/userdir-ldap.confc
 file=/etc/exim4/blacklist
 file=/etc/exim4/host_blacklist
@@ -260,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
@@ -272,16 +276,22 @@ file=/etc/munin/plugins/irqstats
 file=/etc/munin/plugins/load
 file=/etc/munin/plugins/memory
 file=/etc/munin/plugins/ntp_offset
+file=/etc/munin/plugins/ntp_states
 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
+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
@@ -341,6 +351,7 @@ file=/etc/monit/monitrc
 file=/etc/monit/monit.d/01puppet
 file=/etc/monit/monit.d/00debian.org
 file=/etc/cron.d/dsa-puppet-stuff
+file=/etc/cron.d/dsa-buildd
 <%= extrafiles=""
 case fqdn 
 when "spohr.debian.org": extrafiles="file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg