X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=1bdaeee4b1392d49cfb2301f22fcc8a5b68ca660;hb=34ffa51d586aa81dd7223483a6ab282fdd27b5b1;hp=7cb67a7f901a8ec4296683d395e37c9d9230202a;hpb=188ca3ce42a4b446cc153adbf364eeb12fd278f3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 7cb67a7f9..1bdaeee4b 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -155,6 +155,14 @@ file=/etc/rc.local
 file=/etc/unbound
 <% end -%>
 file=/etc/dsa
+<% if scope.lookupvar('site::nodeinfo')['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
+<% end -%>
 
 [LogFiles]
 ##
@@ -265,6 +273,7 @@ file=/etc/exim4/ssl/thishost.key
 file=/etc/ssh/ssh_config
 file=/etc/ssh/sshd_config
 file=/etc/dsa/cron.ignore.dsa-puppet-stuff
+file=/etc/vsftpd.conf
 <%=
 out=""
 if scope.lookupvar('site::nodeinfo')['heavy_exim']
@@ -407,6 +416,7 @@ dir=4/etc/dsa-kvm
 dir=3/etc/lvm
 <% end -%>
 dir=1/etc/ferm/dsa.d
+dir=1/etc/ferm/conf.d
 dir=3/etc/facter
 file=/etc/ferm/conf.d/me.conf
 file=/etc/ferm/conf.d/defs.conf