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=d2f3765d76af7406f1b1b552f2d5bc4240f97295;hpb=23bbc8c6c9c74ae94707804401937010576e0c8c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index d2f3765d7..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
@@ -82,8 +80,8 @@ masters "easydns-masters" {
 };
 acl "easydns-ACL" {
 	// https://cp.easydns.com/manage/domains/secondary/edit.php
-	//64.68.200.91/32;
-	//205.210.42.80/32;
+	64.68.200.91/32;
+	205.210.42.80/32;
 	key 82.195.75.91-key ;
 };
 
@@ -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";