X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=02775b7b6d4b234ff4d512c8ea7ae36d0d75751f;hb=f965e974fc44ba2884e49df958e6dd373af82e47;hp=4dc60df3b792c23b58c23fb726fddc862c518df6;hpb=6113877e86c27e692312d31506f3f4ae51339607;p=dsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 4dc60df3..02775b7b 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 scope.lookupvar('site::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,15 @@ 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
+file=/etc/static-clients.conf
+<% elsif classes.include?("roles::static_master") -%>
+file=/etc/static-clients.conf
+<% elsif classes.include?("roles::static_source") -%>
+file=/etc/static-clients.conf
+<% end -%>
+file=/etc/multipath/wwids
 
 #
 # There are files in /etc that might change, thus changing the directory
@@ -113,14 +121,20 @@ file=/etc/ssh
 file=/etc/network/run
 file=/etc/bind/zones
 file=/etc/spamassassin/sa-update-keys
+file=/etc/init.d/.depend.boot
+file=/etc/init.d/.depend.start
+file=/etc/init.d/.depend.stop
 
 # These are the directories for the files we handle with puppet
 file=/etc/apache2/conf.d
 files=/etc/apache2/mods-enabled
+files=/etc/apache2/sites-available
+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,7 +147,7 @@ file=/etc/nagios
 file=/etc/nagios/nrpe.d
 file=/etc/nagios/obsolete-packages-ignore.d
 file=/etc/bind/geodns
-<% if scope.lookupvar('site::nodeinfo')['nagiosmaster'] -%>
+<% if scope.function_has_role(['nagiosmaster']) -%>
 file=/etc/nagios3/puppetconf.d
 <% end -%>
 file=/etc/puppet
@@ -144,6 +158,8 @@ file=/usr/sbin
 file=/etc/monit
 file=/etc/monit/monit.d
 file=/etc/pam.d
+file=/etc/schroot/default
+file=/etc/schroot/setup.d
 file=/etc/sysctl.d
 file=/etc/syslog-ng
 file=/etc/stunnel
@@ -151,10 +167,13 @@ file=/etc/ferm/
 file=/etc/ferm/conf.d
 file=/etc/ferm/dsa.d
 file=/etc/rc.local
-<% unless scope.lookupvar('::lsbdistcodename') == 'lenny' %>
 file=/etc/unbound
-<% end -%>
 file=/etc/dsa
+file=/etc/rabbitmq
+<% if scope.function_has_role(['static_mirror']) or scope.function_has_role(['static_source']) or scope.function_has_role(['static_master']) -%>
+file=/etc/ssh/userkeys
+file=/etc/ssh/userkeys/staticsync
+<% end -%>
 
 [LogFiles]
 ##
@@ -220,6 +239,7 @@ file=/var/log/syslog
 file=/etc/resolv.conf
 <% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
 file=/etc/dupload.conf
+file=/etc/buildd/buildd.conf
 <% end -%>
 file=/etc/resolv.conf.pcmcia.save
 file=/etc/nologin
@@ -236,12 +256,17 @@ 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/dsa/pubsub.conf
+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
@@ -256,15 +281,26 @@ 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
 file=/etc/exim4/ssl/ca.crl
 file=/etc/exim4/ssl/thishost.crt
 file=/etc/exim4/ssl/thishost.key
+dir=3/etc/exim4/email-virtualdomains
 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
+file=/etc/rabbitmq/rabbitmq.config
+file=/etc/rabbitmq/enabled_plugins
+dir=/etc/bacula/storages-list.d
+dir=/etc/bacula/storage-conf.d
+dir=/etc/bacula/conf.d
 <%=
 out=""
 if scope.lookupvar('site::nodeinfo')['heavy_exim']
@@ -312,7 +348,7 @@ file=/etc/munin/plugins/exim_mailqueue
 file=/etc/munin/plugins/exim_mailstats
 file=/etc/munin/plugins/postfix_mailqueue
 file=/etc/munin/plugins/postfix_mailvolume
-file=/etc/apache2/conf.d/ressource-limits
+file=/etc/apache2/conf.d/resource-limits
 file=/etc/apache2/mods-enabled/info.conf
 file=/etc/apache2/mods-enabled/info.load
 file=/etc/apache2/mods-enabled/server.conf
@@ -325,6 +361,10 @@ 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
@@ -333,11 +373,12 @@ file=/etc/apt/sources.list.d/backports.org.list
 file=/etc/apt/apt.conf.d/local-compression
 file=/etc/apt/apt.conf.d/local-recommends
 file=/etc/apt/apt.conf.d/local-pdiffs
+file=/etc/apt/apt.conf.d/local-ssl-ca-global
 file=/etc/apt/preferences.d/buildd
+file=/etc/systemd/system/puppet.service
 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
@@ -349,6 +390,7 @@ file=/etc/nagios/nrpe.d/nrpe_dsa.cfg
 file=/etc/nagios/nrpe.d/debianorg.cfg
 file=/etc/nagios/obsolete-packages-ignore
 file=/etc/nagios/obsolete-packages-ignore.d/hostspecific
+file=/etc/nagios/check-libs.conf
 file=/usr/lib/nagios/plugins/dsa-check-packages
 file=/usr/lib/nagios/plugins/dsa-check-soas
 file=/usr/lib/nagios/plugins/dsa-check-mirrorsync
@@ -369,6 +411,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
@@ -377,7 +420,13 @@ 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
-<% if scope.lookupvar('site::nodeinfo')['nagiosmaster'] -%>
+file=/etc/default/schroot
+file=/etc/schroot/default/nssdatabases
+file=/etc/schroot/setup.d/99porterbox-extra-sources
+file=/etc/schroot/setup.d/99porterbox-extra-apt-options
+file=/etc/openvswitch/conf.db
+
+<% if scope.function_has_role(['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
@@ -387,10 +436,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 scope.lookupvar('site::nodeinfo')['muninmaster'] -%>
+<% if scope.function_has_role(['muninmaster']) -%>
 file=/etc/munin/munin.conf
 <% end -%>
-<% if scope.lookupvar('site::nodeinfo')['puppetmaster'] -%>
+<% if scope.function_has_role(['puppetmaster']) -%>
 dir=8/etc/puppet
 <% end -%>  
 <% if classes.include?('named::geodns') -%>
@@ -400,21 +449,41 @@ 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
 file=/etc/ferm/conf.d/me.conf
 file=/etc/ferm/conf.d/defs.conf
 file=/etc/ferm/ferm.conf
+file=/etc/ssl/README
 dir=2/etc/ssl/debian
-<% unless scope.lookupvar('::lsbdistcodename') == 'lenny' %>
+dir=1/etc/ssl/certs
+dir=1/etc/ssl/ca-debian
+dir=1/etc/ssl/ca-global
+file=/etc/ca-certificates.conf
+file=/etc/ca-certificates-debian.conf
+file=/etc/ca-certificates-global.conf
+file=/etc/ssl/private/ssl-cert-snakeoil.key
 file=/etc/unbound/unbound.conf
+<% if scope.lookupvar('::fqdn') == "draghi.debian.org" -%>
+file=/etc/openvpn/deb-mgmt-clients.pool
+<% end -%>
+
+
+<% if scope.function_has_role(['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
+dir=1/usr/share/puppet-dashboard/tmp/pids
+<% end -%>
+
+<% if classes.include?("porterbox") %>
+file=/etc/cron.weekly/puppet-mail-big-homedirs
 <% end -%>
 
 [IgnoreNone]