X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=cfb1a704c64a1a0c936d9dcb5b39e8e4d02c4ec5;hb=065af2fbf6d59747e3e310add7aec8c6f4dc3425;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..cfb1a704c 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
@@ -53,11 +51,7 @@ options {
 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;
 	};
@@ -74,36 +68,5 @@ logging {
 
 };
 
-<% 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
-};
-<% end -%>
-
 include "/etc/bind/named.conf.puppet-shared-keys";
+include "/etc/bind/named.conf.puppet-misc";