X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=1bdaeee4b1392d49cfb2301f22fcc8a5b68ca660;hb=87e8c26653128159565d887ecc9172aa65010e1f;hp=16f4cb672970083674d33d8697ef85af6644ea2c;hpb=838cb149ee7647538058c3e47531a0bdb51013f2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 16f4cb672..1bdaeee4b 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -138,6 +138,7 @@ file=/etc/nagios3/puppetconf.d
 <% end -%>
 file=/etc/puppet
 file=/etc/cron.d
+file=/etc/cron.weekly
 file=/usr/lib/nagios/plugins
 file=/usr/sbin
 file=/etc/monit
@@ -154,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]
 ##
@@ -264,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']
@@ -406,6 +416,8 @@ 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
 file=/etc/ferm/ferm.conf