X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=83f1f638c94365de51e2075ab2bdcf5561bb2d75;hb=d0c098685b92334a611a0c596a35f538b95ead47;hp=8843d845fc0b2f8b9a4d18625133b7a13826668e;hpb=c5bcaa21b472305e786ce51ce9a421cd5728178b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index 8843d845f..83f1f638c 100644
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -5,12 +5,16 @@
 
 acl Nagios {
 <%=
-  roles = scope.lookupvar('site::roles')
+  roles = scope.lookupvar('deprecated::roles')
   str = ''
   roles['nagiosmaster'].each do |node|
-          scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
-              str += "\t" + ip + "/32;\n"
-          end
+          str += scope.lookupvar('deprecated::allnodeinfo')[node]['ipHostNumber'].collect do |ip|
+              if ip =~ /:/
+                  "\t#{ip}/128;\n"
+              else
+                  "\t#{ip}/32;\n"
+              end
+          end.join("")
   end
   str-%>
 };
@@ -68,50 +72,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
-};
-
-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";
+include "/etc/bind/named.conf.puppet-misc";