X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=68ed9a3dcc6a707a932ac53cf698ac05df084798;hb=535237cf6c30f48ab5202c165a5537253e818266;hp=13282df11d9af00e0a08eb73b61752280fcd7d68;hpb=d53c789b368b6d3dbc41671fd7a1f16050172627;p=mirror%2Fdsa-puppet.git diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index 13282df11..68ed9a3dc 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -436,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') -%>