projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
377748b
)
Simply ignore resolv.conf
author
Peter Palfrader
<peter@palfrader.org>
Tue, 1 Mar 2011 10:09:39 +0000
(11:09 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Tue, 1 Mar 2011 10:09:39 +0000
(11:09 +0100)
modules/samhain/templates/samhainrc.erb
patch
|
blob
|
history
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
58cb651
..
5d8320e
100644
(file)
--- 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 -%>