X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=762039894e4e86149fe3a1ccf596e439016dc1e7;hb=bd8dfe6050b3ee121b4c864b42857d1c5ebfc665;hp=a2f309e27f2f97542b5bd149847d7959a96144cc;hpb=fe3c81154c72b3fd5d5911fb3893021ffe6032e0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index a2f309e27..762039894 100644
--- 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 = ''
-  localinfo.keys.sort.each do |node|
-      if localinfo[node]['nagiosmaster']
-          keyinfo[node][0]['ipHostNumber'].each do |ip|
+  roles['nagiosmaster'].each do |node|
+          scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
               str += "\t" + ip + "/32;\n"
           end
-      end
   end
   str-%>
 };
@@ -20,7 +19,8 @@ options {
 	directory "/var/cache/bind";
 
 	auth-nxdomain no;    # conform to RFC1035
-	listen-on-v6 { any; };
+	listen-on { ! 127.0.0.1; any; };
+	listen-on-v6 { ! ::1; any; };
 
 	allow-transfer { none; };
 	allow-update { none; };
@@ -30,9 +30,6 @@ options {
 
 <%=
   allowed='Nagios; '
-  if classes.include?('named::secondary') or classes.include?('named::recursor')
-    allowed += 'localnets; '
-  end
 
   str =  "\tallow-recursion { " + allowed + " };\n"
   str += "\tallow-query { " + allowed + " };\n"
@@ -40,10 +37,17 @@ options {
   str
 -%>
 
-<% if classes.include?('named::secondary') -%>
+<% if classes.include?('named::authoritative') or classes.include?('named::geodns') -%>
 	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 {
@@ -59,6 +63,15 @@ 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; };
+
 };
 
- 
+include "/etc/bind/named.conf.puppet-shared-keys";