X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=aa9be9b13d8b5cb590ea0c57a87035ee207a813d;hb=53426b9c1ca14d5f0f2a8216fc6d01d080bdb329;hp=b7eadf1bf41c51a21394e9d3f7ecabaefea9a878;hpb=8c75e410466c6a6360002891518cc446f1ccec55;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index b7eadf1bf..aa9be9b13 100644
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -8,7 +8,7 @@ acl Nagios {
   str = ''
   localinfo.keys.sort.each do |node|
       if localinfo[node]['nagiosmaster']
-          keyinfo[node][0]['ipHostNumber'].each do |ip|
+          allnodeinfo[node]['ipHostNumber'].each do |ip|
               str += "\t" + ip + "/32;\n"
           end
       end
@@ -20,7 +20,12 @@ options {
 	directory "/var/cache/bind";
 
 	auth-nxdomain no;    # conform to RFC1035
+<% if classes.include?("named::geodns") or %w{diamond orff senfl}.include?(hostname) -%>
+	listen-on { ! 127.0.0.1; any; };
+	listen-on-v6 { ! ::1; any; };
+<% else -%>
 	listen-on-v6 { any; };
+<% end -%>
 
 	allow-transfer { none; };
 	allow-update { none; };
@@ -30,7 +35,7 @@ options {
 
 <%=
   allowed='Nagios; '
-  if classes.include?('named::secondary') or classes.include?('named::recursor')
+  if (classes.include?('named::authoritative') and not %w{diamond orff senfl}.include?(hostname)) or classes.include?('named::recursor')
     allowed += 'localnets; '
   end
 
@@ -40,7 +45,7 @@ options {
   str
 -%>
 
-<% if classes.include?('named::secondary') or classes.include?('named::geodns') -%>
+<% if classes.include?('named::authoritative') or classes.include?('named::geodns') -%>
 	dnssec-enable yes;
 	dnssec-validation yes;
 <% end -%>