X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=1757345b6612a85e61331c73f21adb65dce6a7e7;hb=e8d69944e7abdcbe489b595f2b54f87fa5ee73b2;hp=58cb6514baf60b39e7ed08d7bed7eeb2dd6bf588;hpb=6986d1b34c1e3223e5e3a0a321cc326a3068b392;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 58cb6514b..1757345b6 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
@@ -150,7 +147,10 @@ file=/etc/ferm/
 file=/etc/ferm/conf.d
 file=/etc/ferm/dsa.d
 file=/etc/rc.local
-
+<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
+file=/etc/unbound
+<% end -%>
+file=/etc/dsa
 
 [LogFiles]
 ##
@@ -212,9 +212,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 -%>
@@ -261,6 +259,7 @@ file=/etc/exim4/ssl/thishost.crt
 file=/etc/exim4/ssl/thishost.key
 file=/etc/ssh/ssh_config
 file=/etc/ssh/sshd_config
+file=/etc/dsa/cron.ignore.dsa-puppet-stuff
 <%=
 out=""
 if nodeinfo['heavy_exim']
@@ -391,7 +390,6 @@ file=/etc/bind/named.conf.debian-zones
 <% if fqdn == "dijkstra.debian.org" -%>
 dir=4/etc/dsa-kvm
 <% end -%>
-
 <% if nodeinfo['buildd'] -%>
 dir=3/etc/lvm
 <% end -%>
@@ -400,6 +398,9 @@ file=/etc/ferm/conf.d/me.conf
 file=/etc/ferm/conf.d/defs.conf
 file=/etc/ferm/ferm.conf
 dir=2/etc/ssl/debian
+<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
+file=/etc/unbound/unbound.conf
+<% end -%>
 
 [IgnoreNone]
 ##
@@ -429,6 +430,7 @@ dir=3/sbin
 dir=/usr/sbin
 dir=/lib
 dir=3/usr/lib
+dir=3/usr/share
 #
 # RedHat and Debian have the bootinit scripts in /etc/init.d/* or /etc/rc.d/*, 
 #        so we go 3 levels deep there too