X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=039922dbb61ca3ebf7cec38f6395a3b5349c68be;hb=99a87c87434727902af7e6c37c7bc09dc682ddbb;hp=677a2ee1d52afff850bf3947fd78830f2fecce6f;hpb=8b9ef2ae1c592a5dbde5f36afae681650e89053a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 677a2ee1d..039922dbb 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -114,6 +114,8 @@ file=/etc/apache2/conf.d
 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
@@ -135,7 +137,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
@@ -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,16 +262,45 @@ 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/cpu
+file=/etc/munin/plugins/df
+file=/etc/munin/plugins/df_abs
+file=/etc/munin/plugins/df_inode
+file=/etc/munin/plugins/entropy
+file=/etc/munin/plugins/forks
+file=/etc/munin/plugins/interrupts
+file=/etc/munin/plugins/iostat
+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
+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