X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=7cf2709d6a65e7fe40c32cfc14d5c237408eb3d1;hb=cdce50b094ce870d1129a994a3e1aa854da7c71c;hp=c29caa3589750d96e15c212c4c14979981c95f67;hpb=b4cb2127c9faf4717b9a0c295b949c8460e8e575;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index c29caa358..7cf2709d6 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 -%>
 
 #
@@ -159,6 +164,7 @@ file=/etc/ferm/dsa.d
 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'] -%>
 file=/etc/ssh/userkeys
 file=/etc/ssh/userkeys/staticsync
@@ -283,6 +289,9 @@ file=/etc/vsftpd.conf
 file=/etc/aliases
 file=/etc/multipath.conf
 file=/etc/static-components.conf
+file=/etc/rabbitmq/rabbitmq.config
+dir=/etc/bacula/storages-list.d
+dir=/etc/bacula/conf.d
 <%=
 out=""
 if scope.lookupvar('site::nodeinfo')['heavy_exim']
@@ -330,7 +339,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
@@ -451,6 +460,10 @@ file=/usr/share/puppet-dashboard/public/stylesheets/all.css
 file=/usr/share/puppet-dashboard/public/javascripts/all.js
 <% end -%>
 
+<% if classes.include?("porterbox") %>
+file=/etc/cron.weekly/puppet-mail-big-homedirs
+<% end -%>
+
 [IgnoreNone]
 ##
 ## for these files, all modifications (even access time) are reported