X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=8bc2f87d1065dcbf2df9439080e1f680a858a785;hb=b783bf06da0040034c506ec529a625ed074b1c01;hp=e98dc67bf097bde726a1bc901871ecc22f31fa8e;hpb=e0f013c2510e18993bbe6fbf3f3600a51174e26f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index e98dc67bf..8bc2f87d1 100644
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -6,9 +6,9 @@
 acl Nagios {
 <%=
   str = ''
-  localinfo.keys.sort.each do |node|
-      if localinfo[node]['nagiosmaster']
-          allnodeinfo[node]['ipHostNumber'].each do |ip|
+  scope.lookupvar('site::localinfo').keys.sort.each do |node|
+      if scope.lookupvar('site::localinfo')[node]['nagiosmaster']
+          scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
               str += "\t" + ip + "/32;\n"
           end
       end
@@ -20,12 +20,8 @@ options {
 	directory "/var/cache/bind";
 
 	auth-nxdomain no;    # conform to RFC1035
-<% if classes.include?("named::geodns") or %w{saens}.include(hostname) -%>
 	listen-on { ! 127.0.0.1; any; };
 	listen-on-v6 { ! ::1; any; };
-<% else -%>
-	listen-on-v6 { any; };
-<% end -%>
 
 	allow-transfer { none; };
 	allow-update { none; };
@@ -35,9 +31,6 @@ options {
 
 <%=
   allowed='Nagios; '
-  if classes.include?('named::authoritative') or classes.include?('named::recursor')
-    allowed += 'localnets; '
-  end
 
   str =  "\tallow-recursion { " + allowed + " };\n"
   str += "\tallow-query { " + allowed + " };\n"
@@ -49,6 +42,16 @@ options {
 	dnssec-enable yes;
 	dnssec-validation yes;
 <% end -%>
+
+<% if %w{senfl ravel orff diamond rietz}.include?(hostname) -%>
+	rate-limit {
+		responses-per-second 25;
+		window 5;
+		slip 5;
+		qps-scale 250;
+	};
+<% end -%>
+
 };
 
 logging {