X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=cfb1a704c64a1a0c936d9dcb5b39e8e4d02c4ec5;hb=3fee25a39bd98c670a5046c3d9fadf792a88fac4;hp=9ec33e8b1c24385b892118d1a4b0455aa568a64c;hpb=73b5e0f765fe99a5c0c6999898d931b9e0e91300;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index 9ec33e8b1..cfb1a704c 100644
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -37,38 +37,36 @@ options {
   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";