# timestamps. Put it here as 'file', and in the ReadOnly section as 'dir'.
#
file=/etc
+file=/etc/dsa
file=/etc/ssh
file=/etc/network/run
file=/etc/bind/zones
file=/etc/nagios/nrpe.d
file=/etc/nagios/obsolete-packages-ignore.d
file=/etc/bind/geodns
-<% if scope.function_has_role('nagiosmaster') -%>
+<% if scope.function_has_role(['nagiosmaster']) -%>
file=/etc/nagios3/puppetconf.d
<% end -%>
file=/etc/puppet
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') -%>
+<% 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 -%>
## This file might be created or removed by the system sometimes.
##
file=/etc/resolv.conf
-<% if scope.function_has_role('buildd') -%>
+<% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
file=/etc/dupload.conf
<% end -%>
file=/etc/resolv.conf.pcmcia.save
file=/etc/resolv.conf.dhclient-new
# We handle these files with puppet - please to not be bothering us
+file=/etc/dsa/pubsub.conf
file=/etc/nsswitch.conf
file=/etc/timezone
file=/etc/motd.tail
file=/etc/multipath.conf
file=/etc/static-components.conf
file=/etc/rabbitmq/rabbitmq.config
+file=/etc/rabbitmq/enabled_plugins
dir=/etc/bacula/storages-list.d
+dir=/etc/bacula/storage-conf.d
dir=/etc/bacula/conf.d
<%=
out=""
file=/etc/default/schroot
file=/etc/schroot/default/nssdatabases
-<% if scope.function_has_role('nagiosmaster') -%>
+<% if scope.function_has_role(['nagiosmaster']) -%>
file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg
file=/etc/nagios3/puppetconf.d/auto-hosts.cfg
file=/etc/nagios3/puppetconf.d/auto-services.cfg
file=/etc/nagios3/puppetconf.d/auto-servicegroups.cfg
file=/etc/nagios3/puppetconf.d/contacts.cfg
<% end -%>
-<% if scope.function_has_role('muninmaster') -%>
+<% if scope.function_has_role(['muninmaster']) -%>
file=/etc/munin/munin.conf
<% end -%>
-<% if scope.function_has_role('puppetmaster') -%>
+<% if scope.function_has_role(['puppetmaster']) -%>
dir=8/etc/puppet
<% end -%>
<% if classes.include?('named::geodns') -%>
<% end -%>
-<% if scope.function_has_role('puppetmaster') %>
+<% if scope.function_has_role(['puppetmaster']) %>
# Damn you rails apps and your shoddy packaging
file=/usr/share/puppet-dashboard/public/stylesheets