X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=812a4357d745d1ea4930f1ef95b8d89dd7ba7689;hb=b1f8558dfacf54e10be160e26b92ef1b5fe27d07;hp=cc8ea4b3bc87631904f68edf40c26c2ccdf6ebe6;hpb=43e03d8781740f8a7dbafb4fea95d37c25299cf4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index cc8ea4b3b..812a4357d 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -104,7 +104,13 @@ file=/etc/bind/named.conf.options
 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
@@ -115,10 +121,14 @@ 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
@@ -127,7 +137,6 @@ file=/etc/munin/plugin-conf.d
 file=/etc/munin/munin-conf.d
 file=/etc/exim4
 file=/etc/exim4/ssl
-file=3/etc/exim4/email-virtualdomains
 file=/etc/apt
 file=/etc/apt/apt.conf.d
 file=/etc/apt/sources.list.d
@@ -138,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
@@ -150,6 +159,7 @@ 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
@@ -159,10 +169,12 @@ file=/etc/ferm/dsa.d
 file=/etc/rc.local
 file=/etc/unbound
 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/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 -%>
+file=/etc/rsyncd
 
 [LogFiles]
 ##
@@ -228,6 +240,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
@@ -244,6 +257,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/dsa/pubsub.conf
 file=/etc/nsswitch.conf
 file=/etc/timezone
 file=/etc/motd.tail
@@ -275,6 +289,7 @@ 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
@@ -282,6 +297,11 @@ 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']
@@ -329,7 +349,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
@@ -354,7 +374,9 @@ 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
@@ -369,6 +391,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
@@ -400,8 +423,11 @@ file=/etc/cron.d/dsa-buildd
 file=/etc/cron.weekly/stunnel-ekey-restart
 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.lookupvar('site::nodeinfo')['nagiosmaster'] -%>
+<% 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
@@ -411,10 +437,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') -%>
@@ -432,22 +458,34 @@ 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
 dir=1/etc/ssl/certs
-dir=1/etc/ssl/servicecerts
+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 -%>
+file=/etc/rsyncd/debian.secrets
 
 
-<% if scope.lookupvar('site::nodeinfo')['puppetmaster'] %>
+<% 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]