add rcode0.net to primary nameserver firewall rules

[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 a372fc9..203d2a5 100644 (file)
--- 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;
@@ -52,6 +51,12 @@ options {
        };
 <% 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 {
@@ -67,6 +72,17 @@ logging {
        };
        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; };
+
 };
 
- 
+<% if classes.include?('named::authoritative') -%>
+include "/etc/bind/named.conf.puppet-shared-keys";
+<% end -%>