Also ignore /etc/static-components.conf

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

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 0f227ed7b6037e69f8b22adb1654de191a6edbf8..1cef8c968b508e75378b1364c94df06a5b1d93a1 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -67,9 +67,7 @@
 # RedefIgnoreNone=(no default)
 # RedefUser0=(no default)
 # RedefUser1=(no default)
-<% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
 IgnoreMissing=/etc/lvm/archive/.*.vg
-<% end -%>
 
 [Attributes]
 ##
@@ -104,6 +102,12 @@ file=/etc/bind/geodns/recvconf.files
 file=/etc/bind/named.conf.options
 <% end -%>
 file=/etc/apache2/conf.d/puppet-builddlist
+<% if classes.include?("roles::static_base") -%>
+file=/etc/static-components.conf
+<% end -%>
+<% if classes.include?("roles::static_mirror") -%>
+file=/etc/apache2/sites-available/static-vhosts-simple
+<% end -%>
 
 #
 # There are files in /etc that might change, thus changing the directory
@@ -147,6 +151,7 @@ file=/usr/sbin
 file=/etc/monit
 file=/etc/monit/monit.d
 file=/etc/pam.d
+file=/etc/schroot/default
 file=/etc/sysctl.d
 file=/etc/syslog-ng
 file=/etc/stunnel
@@ -241,6 +246,7 @@ file=/etc/blkid.tab.old
 file=/etc/resolv.conf.dhclient-new
 
 # We handle these files with puppet - please to not be bothering us
+file=/etc/nsswitch.conf
 file=/etc/timezone
 file=/etc/motd.tail
 file=/etc/update-motd.d/
@@ -264,6 +270,7 @@ file=/etc/exim4/rbllist
 file=/etc/exim4/rhsbllist
 file=/etc/exim4/submission-domains
 file=/etc/exim4/virtualdomains
+file=/etc/exim4/email-virtualdomains
 file=/etc/exim4/whitelist
 file=/etc/exim4/local-settings.conf
 file=/etc/exim4/ssl/ca.crt
@@ -274,6 +281,9 @@ file=/etc/ssh/ssh_config
 file=/etc/ssh/sshd_config
 file=/etc/dsa/cron.ignore.dsa-puppet-stuff
 file=/etc/vsftpd.conf
+file=/etc/aliases
+file=/etc/multipath.conf
+file=/etc/static-components.conf
 <%=
 out=""
 if scope.lookupvar('site::nodeinfo')['heavy_exim']
@@ -350,7 +360,6 @@ file=/etc/apt/preferences.d/buildd
 file=/etc/puppet/puppet.conf
 file=/etc/default/puppet
 file=/etc/default/postgrey
-file=/etc/default/schroot
 file=/etc/default/syslog-ng
 file=/etc/logrotate.d/exim4-paniclog
 file=/etc/logrotate.d/exim4-base
@@ -382,6 +391,7 @@ file=/usr/lib/nagios/plugins/dsa-check-raid-sw
 file=/usr/lib/nagios/plugins/dsa-update-samhain-status
 file=/etc/sudoers
 file=/etc/stunnel/puppet-ekeyd-peer.pem
+file=/etc/stunnel/puppet-ekeyd.conf
 file=/etc/sysctl.d/mmap_min_addr.conf
 file=/etc/pam.d/sudo
 file=/etc/monit/monitrc
@@ -390,6 +400,9 @@ file=/etc/monit/monit.d/00debian.org
 file=/etc/cron.d/dsa-puppet-stuff
 file=/etc/cron.d/dsa-buildd
 file=/etc/cron.weekly/stunnel-ekey-restart
+file=/etc/default/schroot
+file=/etc/schroot/default/nssdatabases
+
 <% if scope.lookupvar('site::nodeinfo')['nagiosmaster'] -%>
 file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg
 file=/etc/nagios3/puppetconf.d/auto-hosts.cfg
@@ -413,12 +426,8 @@ dir=1/etc/bind/geodns
 dir=1/etc/bind
 file=/etc/bind/named.conf.debian-zones
 <% end -%>
-<% if scope.lookupvar('::fqdn') == "dijkstra.debian.org" -%>
-dir=4/etc/dsa-kvm
-<% end -%>
-<% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
-dir=3/etc/lvm
-<% end -%>
+dir=3/etc/lvm/archive
+dir=3/etc/lvm/backup
 dir=1/etc/ferm/dsa.d
 dir=1/etc/ferm/conf.d
 dir=3/etc/facter
@@ -427,6 +436,10 @@ file=/etc/ferm/conf.d/defs.conf
 file=/etc/ferm/ferm.conf
 dir=2/etc/ssl/debian
 file=/etc/unbound/unbound.conf
+<% if scope.lookupvar('::fqdn') == "draghi.debian.org" -%>
+file=/etc/openvpn/deb-mgmt-clients.pool
+<% end -%>
+
 
 <% if scope.lookupvar('site::nodeinfo')['puppetmaster'] %>