X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=72ef825845894f64e0e0d80380891829000d3f7e;hb=cac04a5d8d95c185a6c587348a1dd44c4ad67172;hp=a372fc96441e0425dca8d1672f42a6207bb3cfbb;hpb=00b716768919d3293c434c5ad64084be81123321;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index a372fc964..72ef82584 100644
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -5,13 +5,12 @@
 
 acl Nagios {
 <%=
+  roles = scope.lookupvar('site::roles')
   str = ''
-  scope.lookupvar('site::localinfo').keys.sort.each do |node|
-      if scope.lookupvar('site::localinfo')[node]['nagiosmaster']
+  roles['nagiosmaster'].each do |node|
           scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
               str += "\t" + ip + "/32;\n"
           end
-      end
   end
   str-%>
 };
@@ -43,7 +42,7 @@ options {
 	dnssec-validation yes;
 <% end -%>
 
-<% if %w{senfl ravel orff diamond}.include?(hostname) -%>
+<% if scope.function_has_role(['dns_secondary']) -%>
 	rate-limit {
 		responses-per-second 25;
 		window 5;
@@ -70,3 +69,6 @@ logging {
 };
 
  
+<% if classes.include?('named::authoritative') -%>
+include "/etc/bind/named.conf.puppet-shared-keys";
+<% end -%>