X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=64ebe22833cccea149a9d2292f281ba7fd31085d;hb=56d919ed524189eb7e34f9109613f98d10befbbc;hp=30d3a85dc73e004a813532658356652f0d86544e;hpb=55ac3e7bcfed650a7644596a82cbd6439fdbb4a9;p=dsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 30d3a85d..64ebe228 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -75,7 +75,10 @@
 file=/etc/mtab
 file=/etc/ssh_random_seed
 file=/etc/asound.conf
+<% case hoster when "ubcece", "darmstadt", "ftcollins" then ""
+else -%>
 file=/etc/resolv.conf
+<% end -%>
 file=/etc/localtime
 file=/etc/ioctl.save
 file=/etc/passwd.backup
@@ -205,6 +208,10 @@ file=/var/log/syslog
 ##
 ## This file might be created or removed by the system sometimes.
 ##
+<% case hoster when "ubcece", "darmstadt", "ftcollins" then "" -%>
+file=/etc/resolv.conf
+<% else
+end -%>
 file=/etc/resolv.conf.pcmcia.save
 file=/etc/nologin
 file=/etc/postfix/debian.db
@@ -237,11 +244,9 @@ file=/etc/exim4/locals
 file=/etc/exim4/localusers
 file=/etc/exim4/manualroute
 file=/etc/exim4/rbllist
-file=/etc/exim4/rcpthosts
 file=/etc/exim4/rhsbllist
 file=/etc/exim4/virtualdomains
 file=/etc/exim4/whitelist
-file=/etc/exim4/local-auto.conf
 file=/etc/exim4/local-settings.conf
 file=/etc/exim4/ssl/ca.crt
 file=/etc/exim4/ssl/ca.crl
@@ -262,6 +267,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
@@ -274,11 +281,14 @@ 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
@@ -286,6 +296,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
@@ -345,6 +356,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
@@ -356,6 +368,8 @@ file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg"
 when "handel.debian.org": extrafiles="dir=8/etc/puppet"
 when "dijkstra.debian.org": extrafiles="dir=4/etc/dsa-kvm"
 when /geo[123].debian.org/: extrafiles="dir=1/etc/bind/geodns"
+when /(senfl|ravel|rietz|klecker).debian.org/: extrafiles="dir=1/etc/bind
+file=/etc/bind/named.conf.debian-zones"
 end
 extrafiles
 %>