X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=81d35aeef7c342cf1528461134d0afe31d8ca50e;hb=ced18346fc5d9596f6402f62273adad5b7212c88;hp=e98dc67bf097bde726a1bc901871ecc22f31fa8e;hpb=e0f013c2510e18993bbe6fbf3f3600a51174e26f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index e98dc67bf..81d35aeef 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']
-          allnodeinfo[node]['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,12 +19,8 @@ options {
 	directory "/var/cache/bind";
 
 	auth-nxdomain no;    # conform to RFC1035
-<% if classes.include?("named::geodns") or %w{saens}.include(hostname) -%>
 	listen-on { ! 127.0.0.1; any; };
 	listen-on-v6 { ! ::1; any; };
-<% else -%>
-	listen-on-v6 { any; };
-<% end -%>
 
 	allow-transfer { none; };
 	allow-update { none; };
@@ -35,9 +30,6 @@ options {
 
 <%=
   allowed='Nagios; '
-  if classes.include?('named::authoritative') or classes.include?('named::recursor')
-    allowed += 'localnets; '
-  end
 
   str =  "\tallow-recursion { " + allowed + " };\n"
   str += "\tallow-query { " + allowed + " };\n"
@@ -45,10 +37,15 @@ options {
   str
 -%>
 
-<% 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 {
@@ -64,6 +61,61 @@ 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 scope.function_has_role(['dns_primary']) -%>
+masters "easydns-masters" {
+	// https://cp.easydns.com/manage/domains/secondary/edit.php
+	64.68.200.91;
+	205.210.42.80;
+};
+acl "easydns-ACL" {
+	// https://cp.easydns.com/manage/domains/secondary/edit.php
+	64.68.200.91/32;
+	205.210.42.80/32;
+	key 82.195.75.91-key ;
+};
+
+masters "rcode0-masters" {
+	83.136.34.7;   // rcode0.net ipv4 ntfy
+	2A02:850:8::6; // rcode0.net ipv6 ntfy
+};
+acl "rcode0-ACL" {
+	83.136.34.0/27;  // rcode0.net ipv4 axfr
+	2A02:850:8::/47; // rcode0.net ipv6 axfr
+};
+
+masters "dnsnode-masters" {
+	192.36.144.222; // zork-b.sth.dnsnode.net
+	192.36.144.218; // zork-c.sth.dnsnode.net
+};
+acl "dnsnode-ACL" {
+	192.36.144.222; // zork-b.sth.dnsnode.net
+	192.36.144.218; // zork-c.sth.dnsnode.net
+};
+
+masters "dnsnodeapi-masters" {
+	194.146.105.24; // zorknds-b.sth.dnsnode.net
+	2a01:3f0:0:27::24;
+	194.146.105.25; // zorknds-c.sth.dnsnode.net
+	2a01:3f0:0:28::25;
+};
+acl "dnsnodeapi-ACL" {
+	// 194.146.105.24; // zorknds-b.sth.dnsnode.net
+	// 2a01:3f0:0:27::24;
+	// 194.146.105.25; // zorknds-c.sth.dnsnode.net
+	// 2a01:3f0:0:28::25;
+	key netnod-debian-20171122 ;
 };
+<% end -%>
 
- 
+include "/etc/bind/named.conf.puppet-shared-keys";