Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

[dsa-puppet.git] / modules / samhain / templates / samhainrc.erb

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 2072ae69c1038c3d233df088e5798f04497f0081..1c1b30603a32083f0d4fab49953b786e980316f1 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -79,6 +79,7 @@ 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
@@ -135,7 +136,6 @@ file=/etc/nagios/obsolete-packages-ignore.d
 file=/etc/bind/geodns
 <% if nodeinfo['nagiosmaster'] -%>
 file=/etc/nagios3/puppetconf.d
-file=/etc/puppet
 <% end -%>
 file=/etc/puppet
 file=/etc/cron.d