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=31f9dfd6014b7c04ea8abab3cfef7b051e479b92;hpb=f3c2f2190239034eb550a5cfde4ca4a693f165c6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index 31f9dfd60..81d35aeef 100644
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -37,10 +37,8 @@ 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
@@ -104,6 +102,20 @@ 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";