X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=68ed9a3dcc6a707a932ac53cf698ac05df084798;hb=703c296014e23beedfb75c1d45b4ad3f7a56e26a;hp=262c71a356aef06dbf231aa13f9006537c945c29;hpb=46be0972475f02f51cfda7c1acc0d775faef9efa;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 262c71a35..68ed9a3dc 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -182,9 +182,6 @@ file=/etc/rc.local
 file=/etc/unbound
 file=/etc/dsa
 file=/etc/rabbitmq
-<% if scope.function_has_role(['ssh.upload.d.o']) -%>
-file=/etc/ssh/userkeys/buildd-uploader
-<% end -%>
 <% if classes.include?('roles::buildd_master') -%>
 file=/etc/ssh/userkeys/wb-buildd.more
 <% end -%>
@@ -271,7 +268,6 @@ file=/etc/postfix/debian
 file=/etc/ssh/ssh_known_hosts
 file=/etc/ssh/ssh-rsa-shadow
 file=/var/lib/misc/ssh-rsa-shadow
-file=/etc/.da-backup.trace
 file=/etc/postfix/debianhosts
 file=/etc/postfix/debianhosts.db
 file=/etc/blkid.tab
@@ -324,19 +320,6 @@ file=/etc/rabbitmq/enabled_plugins
 dir=/etc/bacula/storages-list.d
 dir=/etc/bacula/storage-conf.d
 dir=/etc/bacula/conf.d
-<%=
-out=""
-if scope.lookupvar('deprecated::nodeinfo')['heavy_exim']
-  out = '
-file=/etc/exim4/surbl_whitelist.txt
-file=/etc/exim4/exim_surbl.pl
-file=/etc/exim4/ccTLD.txt
-file=/etc/clamav-unofficial-sigs.conf
-file=/etc/clamav-unofficial-sigs.dsa.conf
-'
-end
-out
-%>
 file=/etc/munin/plugins/bind
 file=/etc/munin/plugins/bind_views
 file=/etc/munin/plugins/cpu
@@ -453,7 +436,7 @@ file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg
 file=/etc/nagios3/puppetconf.d/auto-servicegroups.cfg
 file=/etc/nagios3/puppetconf.d/contacts.cfg
 <% end -%>
-<% if scope.function_has_role(['muninmaster']) -%>
+<% if classes.include?('roles::munin_master') -%>
 file=/etc/munin/munin.conf
 <% end -%>
 <% if classes.include?('roles::puppetmaster') -%>