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") -%>
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 scope.function_has_role(['buildd_master']) -%>
+<% if classes.include?('roles::buildd_master') -%>
file=/etc/ssh/userkeys/wb-buildd.more
<% end -%>
file=/etc/rsyncd
## This file might be created or removed by the system sometimes.
##
file=/etc/resolv.conf
-<% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
+<% if classes.include?('roles::buildd') -%>
file=/etc/dupload.conf
file=/etc/buildd/buildd.conf
file=/etc/sbuild/sbuild.conf
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
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
dir=/etc/bacula/conf.d
<%=
out=""
-if scope.lookupvar('site::nodeinfo')['heavy_exim']
+if scope.lookupvar('deprecated::nodeinfo')['heavy_exim']
out = '
file=/etc/exim4/surbl_whitelist.txt
file=/etc/exim4/exim_surbl.pl
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
<% if scope.function_has_role(['muninmaster']) -%>
file=/etc/munin/munin.conf
<% end -%>
-<% if scope.function_has_role(['puppetmaster']) -%>
+<% if classes.include?('roles::puppetmaster') -%>
dir=8/etc/puppet
<% end -%>
<% if classes.include?('named::geodns') -%>
file=/etc/rsyncd/debian.secrets
-<% if scope.function_has_role(['puppetmaster']) %>
+<% if classes.include?('roles::puppetmaster') -%>
# Damn you rails apps and your shoddy packaging
file=/usr/share/puppet-dashboard/public/stylesheets
dir=1/usr/share/puppet-dashboard/tmp/pids
<% end -%>
-<% if classes.include?("porterbox") %>
-file=/etc/cron.weekly/puppet-mail-big-homedirs
-<% end -%>
file=/etc/ssl/private/*.key-certchain
dir=10/var/lib/puppet/clientbucket
## for these files, only access time is ignored
##
dir=/usr/bin
-<%- if has_variable?("merged_usr") && @merged_user -%>
+<%- if has_variable?("merged_usr") && @merged_usr -%>
file=/bin
<% else -%>
dir=/bin
# SuSE (old) has the boot init scripts in /sbin/init.d/*,
# so we go 3 levels deep
#
-<%- if has_variable?("merged_usr") && @merged_user -%>
+<%- if has_variable?("merged_usr") && @merged_usr -%>
file=/lib
file=/sbin
<% else -%>