X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=fbcdf9c7819ce3e1ca184d1ff08bb28e3d50d091;hb=17233769de3cdab224f4e703d5f5dbf71247ac6b;hp=6c35f144bc654cea17ae78110a78ee21ea35f5c5;hpb=d17964e18bfadf0f5c87bc568c782d6524128dc3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 6c35f144b..fbcdf9c78 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
@@ -361,8 +368,9 @@ 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 /(raff|rietz|klecker).debian.org/: extrafiles="dir=1/etc/bind
+when /(senfl|ravel|rietz|klecker).debian.org/: extrafiles="dir=1/etc/bind
 file=/etc/bind/named.conf.debian-zones"
+when /(zandonai|biber).debian.org/: extrafiles="dir=3/etc/lvm"
 end
 extrafiles
 %>