bind should not listen on * if there is unbound installed

[dsa-puppet.git] / modules / named / templates / named.conf.options.erb

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index 5dec7ba1f3c42bc9af2d9dd535d338b884ae401c..b3d6a1f1bc161c2ef3e117cbe370cab66de9687f 100644 (file)
--- 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
@@ -17,43 +17,48 @@ acl Nagios {
 };
 
 options {
-        directory "/var/cache/bind";
+       directory "/var/cache/bind";
 
-        auth-nxdomain no;    # conform to RFC1035
-        listen-on-v6 { any; };
+       auth-nxdomain no;    # conform to RFC1035
+<% if classes.include?("named::geodns") or %w{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; };
-<%= if classes.include?('named::geodns') -%>
-        blackhole { 192.168.0.0/16; 10.0.0.0/8; 172.16.0.0/12; };
-<%= end -%>
+       allow-transfer { none; };
+       allow-update { none; };
+<% if classes.include?("named::geodns") -%>
+       blackhole { 192.168.0.0/16; 10.0.0.0/8; 172.16.0.0/12; };
+<% end -%>
 
 <%=
   allowed='Nagios; '
-  if classes.include?('named::secondary')
+  if (classes.include?('named::authoritative') and not %w{orff senfl}.include?(hostname)) or classes.include?('named::recursor')
     allowed += 'localnets; '
   end
 
-  str =  "allow-recursion { " + allowed + " };\n"
-  str += "allow-query { " + allowed + " };\n"
+  str =  "\tallow-recursion { " + allowed + " };\n"
+  str += "\tallow-query { " + allowed + " };\n"
 
   str
 -%>
 
-<%= if classes.include?('named::secondary') -%>
+<% if classes.include?('named::authoritative') or classes.include?('named::geodns') -%>
        dnssec-enable yes;
        dnssec-validation yes;
-<%= end -%>
+<% end -%>
 };
 
 logging {
 
        channel queries {
-<%= if classes.include?('named::geodns') -%>
+<% if classes.include?('named::geodns') -%>
                file "/var/log/bind9/geoip-query.log" versions 4 size 40m;
-<%= else -%>
+<% else -%>
                file "/var/log/bind9/named-query.log" versions 4 size 40m;
-<%= end -%>
+<% end -%>
                print-time yes;
                print-category yes;
        };
@@ -61,3 +66,4 @@ logging {
        category lame-servers { null; };
 };
 
+