X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=47a0dd79d674bad3629ec8dad52737599e6f1b37;hb=3a8ea253416bbc3db8f4e9b8194dd2e888880745;hp=61234f21a94302811ea829be7fc0f85fc786db3d;hpb=b1c57d74d65300c3a0ab989cd820a0a19022c427;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 61234f21a..47a0dd79d 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -104,6 +104,11 @@ 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 -%>
 
 #
@@ -138,7 +143,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
@@ -160,7 +165,7 @@ file=/etc/rc.local
 file=/etc/unbound
 file=/etc/dsa
 file=/etc/rabbitmq
-<% if scope.lookupvar('site::nodeinfo')['static_mirror'] or scope.lookupvar('site::nodeinfo')['static_source'] or scope.lookupvar('site::nodeinfo')['static_master'] -%>
+<% 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 -%>
@@ -245,6 +250,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
@@ -285,6 +291,10 @@ 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']
@@ -332,7 +342,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
@@ -403,8 +413,9 @@ file=/etc/cron.d/dsa-buildd
 file=/etc/cron.weekly/stunnel-ekey-restart
 file=/etc/default/schroot
 file=/etc/schroot/default/nssdatabases
+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
@@ -414,10 +425,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') -%>
@@ -437,20 +448,24 @@ file=/etc/ferm/conf.d/defs.conf
 file=/etc/ferm/ferm.conf
 dir=2/etc/ssl/debian
 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'] %>
+<% 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]