X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=8b3a3e8eaa06ba92804f10ed6c657c22a19ba96c;hb=75bf6c3a213d5dd70860cd17e89463b881268f20;hp=25e4622e73bb4f89841140693a88165854dd96ac;hpb=a53edf5d1d18057fb465344e2edcb8b4adffe034;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 25e4622e7..8b3a3e8ea 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -119,6 +119,7 @@ file=/etc/spamassassin/sa-update-keys
 # 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
@@ -158,6 +159,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
@@ -274,6 +276,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
@@ -281,6 +284,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']
@@ -328,7 +334,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