X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=8e877a7cfe5a35b80ae0420ecd1d225fe16ff987;hb=5f7c97946997b63e32b009b11578159e826229ad;hp=4dc60df3b792c23b58c23fb726fddc862c518df6;hpb=6113877e86c27e692312d31506f3f4ae51339607;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 4dc60df3b..8e877a7cf 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -151,10 +151,16 @@ file=/etc/ferm/
 file=/etc/ferm/conf.d
 file=/etc/ferm/dsa.d
 file=/etc/rc.local
-<% unless scope.lookupvar('::lsbdistcodename') == 'lenny' %>
 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 +271,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']
@@ -325,6 +332,10 @@ file=/etc/apt/sources.list.d/volatile.list
 file=/etc/apt/sources.list.d/security.list
 file=/etc/apt/sources.list.d/buildd.list
 file=/etc/apt/sources.list.d/buildd.debian.org.list
+file=/etc/apt/sources.list.d/buildd.debian.org-proposed.list
+file=/etc/apt/sources.list.d/buildd.debian.org-experimental.list
+file=/etc/apt/sources.list.d/geoip.list
+file=/etc/apt/sources.list.d/backports.debian.org.list
 file=/etc/apt/sources.list.d/debian.org.list
 file=/etc/apt/sources.list.d/db.debian.org.list
 file=/etc/apt/sources.list.d/debian.restricted.list
@@ -413,9 +424,7 @@ file=/etc/ferm/conf.d/me.conf
 file=/etc/ferm/conf.d/defs.conf
 file=/etc/ferm/ferm.conf
 dir=2/etc/ssl/debian
-<% unless scope.lookupvar('::lsbdistcodename') == 'lenny' %>
 file=/etc/unbound/unbound.conf
-<% end -%>
 
 [IgnoreNone]
 ##