]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Simply ignore resolv.conf
authorPeter Palfrader <peter@palfrader.org>
Tue, 1 Mar 2011 10:09:39 +0000 (11:09 +0100)
committerPeter Palfrader <peter@palfrader.org>
Tue, 1 Mar 2011 10:09:39 +0000 (11:09 +0100)
modules/samhain/templates/samhainrc.erb

index 58cb6514baf60b39e7ed08d7bed7eeb2dd6bf588..5d8320e6e77e9ef0884c7f0cc3a91e5ba6f87aaa 100644 (file)
@@ -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 -%>