X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=820dbdbae5771059d32cff24fe580039df2c1b8e;hb=b3c88aac91d04fb7f4a9b0aab62ed61331461ae0;hp=d248d115785e8412c7881e679eafb518f4fcaeb9;hpb=dcfe12cf33c184758eb0a43ccdb5755e60ffcd27;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index d248d1157..820dbdbae 100644
--- 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
@@ -105,6 +101,7 @@ file=/etc/bind/geodns/recvconf.files
 <% if classes.include?("named") -%>
 file=/etc/bind/named.conf.options
 <% end -%>
+file=/etc/apache2/conf.d/puppet-builddlist
 
 #
 # There are files in /etc that might change, thus changing the directory
@@ -212,9 +209,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 -%>
@@ -263,7 +258,7 @@ file=/etc/ssh/ssh_config
 file=/etc/ssh/sshd_config
 <%=
 out=""
-if not nodeinfo['heavy_exim'].empty?
+if nodeinfo['heavy_exim']
   out = '
 file=/etc/exim4/surbl_whitelist.txt
 file=/etc/exim4/exim_surbl.pl
@@ -315,6 +310,7 @@ file=/etc/apache2/mods-enabled/server.conf
 file=/etc/apache2/mods-enabled/server.load
 file=/etc/apache2/conf.d/server-status
 file=/etc/apache2/conf.d/local-serverinfo
+file=/etc/apache2/sites-available/www.debian.org
 file=/etc/apt/preferences
 file=/etc/apt/sources.list.d/volatile.list
 file=/etc/apt/sources.list.d/security.list
@@ -372,6 +368,7 @@ file=/etc/nagios3/puppetconf.d/auto-services.cfg
 file=/etc/nagios3/puppetconf.d/auto-dependencies.cfg
 file=/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg
 file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg
+file=/etc/nagios3/puppetconf.d/auto-servicegroups.cfg
 <% end -%>
 <% if nodeinfo['muninmaster'] -%>
 file=/etc/munin/munin.conf