From a11f1745a83b2295388734b0bc7a5f1697a9c859 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Wed, 30 Dec 2009 17:23:48 +0000 Subject: [PATCH] ignore resolv.conf when we serve it by puppet Signed-off-by: Stephen Gran --- modules/samhain/templates/samhainrc.erb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 -- 2.20.1