X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=aa9be9b13d8b5cb590ea0c57a87035ee207a813d;hb=965a8d94b2727a7bc156ee6bb1e7a1459d8895e1;hp=3a2624a80a45398ce3ecfe2eff8d4257d1a1a30b;hpb=7b4f24c7e7b0a1e9f85bd2c46d97714a4cebff0f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index 3a2624a80..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]['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::authoritative') 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