From: Stephen Gran <steve@lobefin.net>
Date: Wed, 30 Dec 2009 17:23:48 +0000 (+0000)
Subject: ignore resolv.conf when we serve it by puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c88f03fced16e75b03abcdd42414dff78f043fce;p=mirror%2Fdsa-puppet.git

ignore resolv.conf when we serve it by puppet

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 6c35f144b..6aafaf364 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -75,7 +75,11 @@
 file=/etc/mtab
 file=/etc/ssh_random_seed
 file=/etc/asound.conf
-file=/etc/resolv.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 +209,11 @@ 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