X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=9f03983949cf9af336c33b42703a25a891be3ccf;hb=116904ab926b2cf89a21b0665785d3039ba7e29d;hp=325b7f1fc0dc8eac0b7280e62555416cbf3703d2;hpb=5c8e448fd1972596f6f7d9066100f590c60eba45;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index 325b7f1fc..9f0398394 100644
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -3,19 +3,6 @@
 // USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 //
 
-acl Nagios {
-<%=
-  str = ''
-  scope.lookupvar('site::localinfo').keys.sort.each do |node|
-      if scope.lookupvar('site::localinfo')[node]['nagiosmaster']
-          scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
-              str += "\t" + ip + "/32;\n"
-          end
-      end
-  end
-  str-%>
-};
-
 options {
 	directory "/var/cache/bind";
 
@@ -29,47 +16,36 @@ options {
 	blackhole { 192.168.0.0/16; 10.0.0.0/8; 172.16.0.0/12; };
 <% end -%>
 
-<%=
-  allowed='Nagios; '
-
-  str =  "\tallow-recursion { " + allowed + " };\n"
-  str += "\tallow-query { " + allowed + " };\n"
-
-  str
--%>
-
-<% if classes.include?('named::authoritative') or classes.include?('named::geodns') -%>
 	dnssec-enable yes;
 	dnssec-validation yes;
-<% end -%>
 
-<% if classes.include?('named::authoritative') and not scope.lookupvar('site::nodeinfo')['dns_primary'] -%>
-	rate-limit {
-		responses-per-second 25;
-		window 5;
-		slip 5;
-		qps-scale 250;
-	};
-<% 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; };
+
 };
 
- 
-<% if classes.include?('named::authoritative') -%>
 include "/etc/bind/named.conf.puppet-shared-keys";
-<% end -%>
+include "/etc/bind/named.conf.puppet-misc";