X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=25e4622e73bb4f89841140693a88165854dd96ac;hb=a53edf5d1d18057fb465344e2edcb8b4adffe034;hp=fb1512492b1a2ed96a08a2dd8cadc443f700459d;hpb=b9102db4a394fc961e55110d1f3bc7a020cd2837;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index fb1512492..25e4622e7 100644
--- 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 nodeinfo['buildd'] -%>
 IgnoreMissing=/etc/lvm/archive/.*.vg
-<% end -%>
 
 [Attributes]
 ##
@@ -78,6 +76,7 @@ IgnoreMissing=/etc/lvm/archive/.*.vg
 file=/etc/mtab
 file=/etc/ssh_random_seed
 file=/etc/asound.conf
+file=/etc/bacula/bacula-fd.conf
 file=/etc/localtime
 file=/etc/ioctl.save
 file=/etc/passwd.backup
@@ -103,6 +102,9 @@ 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_mirror") -%>
+file=/etc/apache2/sites-available/static-vhosts-simple
+<% end -%>
 
 #
 # There are files in /etc that might change, thus changing the directory
@@ -117,10 +119,12 @@ file=/etc/spamassassin/sa-update-keys
 # These are the directories for the files we handle with puppet
 file=/etc/apache2/conf.d
 files=/etc/apache2/mods-enabled
+file=/etc/bacula
 file=/etc/samhain
 file=/etc/munin
 file=/etc/munin/plugins
 file=/etc/munin/plugin-conf.d
+file=/etc/munin/munin-conf.d
 file=/etc/exim4
 file=/etc/exim4/ssl
 file=/etc/apt
@@ -133,16 +137,18 @@ file=/etc/nagios
 file=/etc/nagios/nrpe.d
 file=/etc/nagios/obsolete-packages-ignore.d
 file=/etc/bind/geodns
-<% if nodeinfo['nagiosmaster'] -%>
+<% if scope.lookupvar('site::nodeinfo')['nagiosmaster'] -%>
 file=/etc/nagios3/puppetconf.d
 <% end -%>
 file=/etc/puppet
 file=/etc/cron.d
+file=/etc/cron.weekly
 file=/usr/lib/nagios/plugins
 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
@@ -150,10 +156,12 @@ file=/etc/ferm/
 file=/etc/ferm/conf.d
 file=/etc/ferm/dsa.d
 file=/etc/rc.local
-<% unless lsbdistcodename == 'lenny' %>
 file=/etc/unbound
-<% end -%>
 file=/etc/dsa
+<% if scope.lookupvar('site::nodeinfo')['static_mirror'] or scope.lookupvar('site::nodeinfo')['static_source'] or scope.lookupvar('site::nodeinfo')['static_master'] -%>
+file=/etc/ssh/userkeys
+file=/etc/ssh/userkeys/staticsync
+<% end -%>
 
 [LogFiles]
 ##
@@ -217,7 +225,7 @@ file=/var/log/syslog
 ## This file might be created or removed by the system sometimes.
 ##
 file=/etc/resolv.conf
-<% if nodeinfo['buildd'] -%>
+<% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
 file=/etc/dupload.conf
 <% end -%>
 file=/etc/resolv.conf.pcmcia.save
@@ -235,12 +243,16 @@ 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/
+file=/etc/update-motd.d/puppet-motd
 file=/etc/ntp.conf
 file=/etc/samhain/samhainrc
 file=/etc/munin/munin-node.conf
 file=/etc/munin/plugin-conf.d/munin-node
+dir=2/etc/munin/munin-conf.d
 file=/etc/userdir-ldap.confc
 file=/etc/exim4/blacklist
 file=/etc/exim4/host_blacklist
@@ -255,6 +267,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
@@ -264,9 +277,13 @@ file=/etc/exim4/ssl/thishost.key
 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 nodeinfo['heavy_exim']
+if scope.lookupvar('site::nodeinfo')['heavy_exim']
   out = '
 file=/etc/exim4/surbl_whitelist.txt
 file=/etc/exim4/exim_surbl.pl
@@ -323,7 +340,13 @@ file=/etc/apt/preferences
 file=/etc/apt/sources.list.d/volatile.list
 file=/etc/apt/sources.list.d/security.list
 file=/etc/apt/sources.list.d/buildd.list
+file=/etc/apt/sources.list.d/buildd.debian.org.list
+file=/etc/apt/sources.list.d/buildd.debian.org-proposed.list
+file=/etc/apt/sources.list.d/buildd.debian.org-experimental.list
+file=/etc/apt/sources.list.d/geoip.list
+file=/etc/apt/sources.list.d/backports.debian.org.list
 file=/etc/apt/sources.list.d/debian.org.list
+file=/etc/apt/sources.list.d/db.debian.org.list
 file=/etc/apt/sources.list.d/debian.restricted.list
 file=/etc/apt/sources.list.d/debian.list
 file=/etc/apt/sources.list.d/backports.org.list
@@ -334,7 +357,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
@@ -366,6 +388,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
@@ -373,7 +396,11 @@ file=/etc/monit/monit.d/01puppet
 file=/etc/monit/monit.d/00debian.org
 file=/etc/cron.d/dsa-puppet-stuff
 file=/etc/cron.d/dsa-buildd
-<% if nodeinfo['nagiosmaster'] -%>
+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
 file=/etc/nagios3/puppetconf.d/auto-services.cfg
@@ -383,10 +410,10 @@ file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg
 file=/etc/nagios3/puppetconf.d/auto-servicegroups.cfg
 file=/etc/nagios3/puppetconf.d/contacts.cfg
 <% end -%>
-<% if nodeinfo['muninmaster'] -%>
+<% if scope.lookupvar('site::nodeinfo')['muninmaster'] -%>
 file=/etc/munin/munin.conf
 <% end -%>
-<% if nodeinfo['puppetmaster'] -%>
+<% if scope.lookupvar('site::nodeinfo')['puppetmaster'] -%>
 dir=8/etc/puppet
 <% end -%>  
 <% if classes.include?('named::geodns') -%>
@@ -396,19 +423,30 @@ dir=1/etc/bind/geodns
 dir=1/etc/bind
 file=/etc/bind/named.conf.debian-zones
 <% end -%>
-<% if fqdn == "dijkstra.debian.org" -%>
-dir=4/etc/dsa-kvm
-<% end -%>
-<% if 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
 file=/etc/ferm/conf.d/me.conf
 file=/etc/ferm/conf.d/defs.conf
 file=/etc/ferm/ferm.conf
 dir=2/etc/ssl/debian
-<% unless lsbdistcodename == 'lenny' %>
+dir=1/etc/ssl/certs
+dir=1/etc/ssl/servicecerts
 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'] %>
+
+# Damn you rails apps and your shoddy packaging
+file=/usr/share/puppet-dashboard/public/stylesheets
+file=/usr/share/puppet-dashboard/public/javascripts
+file=/usr/share/puppet-dashboard/public/stylesheets/all.css
+file=/usr/share/puppet-dashboard/public/javascripts/all.js
 <% end -%>
 
 [IgnoreNone]