nagiosmaster -> hiera role; bind acls still not converted

[mirror/dsa-puppet.git] / modules / samhain / templates / samhainrc.erb

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index e72f5d4..0bbd965 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -103,12 +103,9 @@ 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_mirror") -%>
+<% if classes.include?("roles::static_mirror_web") -%>
 file=/etc/apache2/sites-available/static-vhosts-simple
-file=/etc/static-clients.conf
-<% elsif classes.include?("roles::static_master") -%>
-file=/etc/static-clients.conf
-<% elsif classes.include?("roles::static_source") -%>
+<% elsif classes.include?("staticsync::static_master") -%>
 file=/etc/static-clients.conf
 <% end -%>
 <% if classes.include?("apache2") -%>
@@ -160,7 +157,7 @@ file=/etc/nagios
 file=/etc/nagios/nrpe.d
 file=/etc/nagios/obsolete-packages-ignore.d
 file=/etc/bind/geodns
-<% if scope.function_has_role(['nagiosmaster']) -%>
+<% if classes.include?("nagios::server") -%>
 file=/etc/nagios3/puppetconf.d
 <% end -%>
 file=/etc/puppet
@@ -185,13 +182,6 @@ file=/etc/rc.local
 file=/etc/unbound
 file=/etc/dsa
 file=/etc/rabbitmq
-<% if scope.function_has_role(['static_mirror']) or scope.function_has_role(['static_source']) or scope.function_has_role(['static_master']) -%>
-file=/etc/ssh/userkeys
-file=/etc/ssh/userkeys/staticsync
-<% end -%>
-<% 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 -%>
@@ -278,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
@@ -321,7 +310,7 @@ file=/etc/exim4/ssl/thishost.key
 dir=3/etc/exim4/email-virtualdomains
 file=/etc/ssh/ssh_config
 file=/etc/ssh/sshd_config
-file=/etc/dsa/cron.ignore.dsa-puppet-stuff
+file=/etc/dsa/cron.ignore.puppet-crontab
 file=/etc/vsftpd.conf
 file=/etc/aliases
 file=/etc/multipath.conf
@@ -331,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('site::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
@@ -441,7 +417,7 @@ file=/etc/pam.d/sudo
 file=/etc/monit/monitrc
 file=/etc/monit/monit.d/01puppet
 file=/etc/monit/monit.d/00debian.org
-file=/etc/cron.d/dsa-puppet-stuff
+file=/etc/cron.d/puppet-crontab
 file=/etc/cron.weekly/stunnel-ekey-restart
 file=/etc/default/schroot
 file=/etc/schroot/default/nssdatabases
@@ -450,7 +426,7 @@ file=/etc/schroot/setup.d/99porterbox-extra-sources
 file=/etc/schroot/setup.d/99porterbox-extra-apt-options
 file=/etc/openvswitch/conf.db
 
-<% if scope.function_has_role(['nagiosmaster']) -%>
+<% if classes.include?("nagios::server") -%>
 file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg
 file=/etc/nagios3/puppetconf.d/auto-hosts.cfg
 file=/etc/nagios3/puppetconf.d/auto-services.cfg
@@ -460,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') -%>