From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 1 Mar 2011 10:09:39 +0000 (+0100)
Subject: Simply ignore resolv.conf
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=0e4256d4d60e13c82c6e02a0393a53075db99ea4;p=mirror%2Fdsa-puppet.git

Simply ignore resolv.conf
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 58cb6514b..5d8320e6e 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -78,10 +78,6 @@ IgnoreMissing=/etc/lvm/archive/.*.vg
 file=/etc/mtab
 file=/etc/ssh_random_seed
 file=/etc/asound.conf
-<% case hoster when "ubcece", "darmstadt", "ftcollins", "grnet" then -%>
-<% else -%>
-file=/etc/resolv.conf
-<% end -%>
 file=/etc/localtime
 file=/etc/ioctl.save
 file=/etc/passwd.backup
@@ -212,9 +208,7 @@ file=/var/log/syslog
 ##
 ## This file might be created or removed by the system sometimes.
 ##
-<% case hoster when "ubcece", "darmstadt", "ftcollins", "grnet" then -%>
 file=/etc/resolv.conf
-<% end -%>
 <% if nodeinfo['buildd'] -%>
 file=/etc/dupload.conf
 <% end -%>