X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=8a8b2bfc8a63c3e7e41fbaa9432685c64942b80f;hb=bc12cd8473771b6feb8de7d688a783b519311d44;hp=0f227ed7b6037e69f8b22adb1654de191a6edbf8;hpb=f8bb5413ac50d17073afc557e3e9b00a54135374;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 0f227ed7b..8a8b2bfc8 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -104,6 +104,12 @@ file=/etc/bind/geodns/recvconf.files
 file=/etc/bind/named.conf.options
 <% end -%>
 file=/etc/apache2/conf.d/puppet-builddlist
+<% if classes.include?("roles::static_base") -%>
+file=/etc/static-components.conf
+<% end -%>
+<% if classes.include?("roles::static_mirror") -%>
+file=/etc/apache2/sites-available/static-vhosts-simple
+<% end -%>
 
 #
 # There are files in /etc that might change, thus changing the directory
@@ -427,6 +433,10 @@ file=/etc/ferm/conf.d/defs.conf
 file=/etc/ferm/ferm.conf
 dir=2/etc/ssl/debian
 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'] %>