No longer allow nagios to recurse on our binds

[mirror/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 5dec7ba..9f03983 100644 (file)
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -3,61 +3,49 @@
 // USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 //
 
-acl Nagios {
-<%=
-  str = ''
-  localinfo.keys.sort.each do |node|
-      if localinfo[node]['nagiosmaster']
-          keyinfo[node][0]['ipHostNumber'].each do |ip|
-              str += "\t" + ip + "/32;\n"
-          end
-      end
-  end
-  str-%>
-};
-
 options {
-        directory "/var/cache/bind";
-
-        auth-nxdomain no;    # conform to RFC1035
-        listen-on-v6 { any; };
+       directory "/var/cache/bind";
 
-        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 -%>
+       auth-nxdomain no;    # conform to RFC1035
+       listen-on { ! 127.0.0.1; any; };
+       listen-on-v6 { ! ::1; any; };
 
-<%=
-  allowed='Nagios; '
-  if classes.include?('named::secondary')
-    allowed += 'localnets; '
-  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 -%>
 
-  str =  "allow-recursion { " + allowed + " };\n"
-  str += "allow-query { " + allowed + " };\n"
-
-  str
--%>
-
-<%= if classes.include?('named::secondary') -%>
        dnssec-enable yes;
        dnssec-validation yes;
-<%= end -%>
+
+       // Defaults are 100 and 10, causing lots and lots of tiny updates.
+       // This way, I hope, we'll get fewer (and thus bigger) updates. -- weasel
+       sig-signing-nodes 5000;
+       sig-signing-signatures 1000;
+
+       max-journal-size 100K;
 };
 
 logging {
 
        channel queries {
-<%= if classes.include?('named::geodns') -%>
-               file "/var/log/bind9/geoip-query.log" versions 4 size 40m;
-<%= else -%>
                file "/var/log/bind9/named-query.log" versions 4 size 40m;
-<%= end -%>
                print-time yes;
                print-category yes;
        };
        category queries { queries; };
        category lame-servers { null; };
+
+       channel transfers {
+               file "/var/log/bind9/named-transfers.log" versions 4 size 40m;
+               print-time yes;
+               print-category yes;
+       };
+       category xfer-out { transfers; };
+       category notify { transfers; };
+
 };
 
+include "/etc/bind/named.conf.puppet-shared-keys";
+include "/etc/bind/named.conf.puppet-misc";