X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=c7c827874c4a318334a25dda057a1e63932131f1;hb=190141f23da1499f30a680f5f00412326deace0d;hp=99e5f5a20324bcd62266ce2aef25994dbc63827a;hpb=a9d15cf99c2f3399cf6fe8e11fbb018e701c4e72;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 99e5f5a20..c7c827874 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -250,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
@@ -290,7 +291,9 @@ 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=""
@@ -365,6 +368,7 @@ 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/preferences.d/buildd
+file=/etc/systemd/system/puppet.service
 file=/etc/puppet/puppet.conf
 file=/etc/default/puppet
 file=/etc/default/postgrey
@@ -410,6 +414,7 @@ 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.function_has_role(['nagiosmaster']) -%>
 file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg
@@ -444,7 +449,6 @@ 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
@@ -458,6 +462,7 @@ 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") %>