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=535237cf6c30f48ab5202c165a5537253e818266;hp=203d2a51a4b024e801bb602b33c05d5a0f87af83;hpb=9ab9ef7aa91bf76b3f8b4195ca4dc488214f097f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index 203d2a51a..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-%>
 };
@@ -37,19 +41,8 @@ options {
   str
 -%>
 
-<% if classes.include?('named::authoritative') or classes.include?('named::geodns') -%>
 	dnssec-enable yes;
 	dnssec-validation yes;
-<% end -%>
-
-<% if scope.function_has_role(['dns_secondary']) -%>
-	rate-limit {
-		responses-per-second 25;
-		window 5;
-		slip 5;
-		qps-scale 250;
-	};
-<% 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
@@ -62,11 +55,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;
 	};
@@ -83,6 +72,5 @@ logging {
 
 };
 
-<% if classes.include?('named::authoritative') -%>
 include "/etc/bind/named.conf.puppet-shared-keys";
-<% end -%>
+include "/etc/bind/named.conf.puppet-misc";