X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=f5e5b39045d6a159cdde72e61b2e1136e06f31c2;hb=52ab75241aa59786d9cf7af14dc99c8ee1641483;hp=4224254d36a6b61b6073952415bc32642166f4ed;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index 4224254d3..f5e5b3904 100644
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -20,12 +20,8 @@ options {
 	directory "/var/cache/bind";
 
 	auth-nxdomain no;    # conform to RFC1035
-<% if classes.include?("named::recursor") -%>
-	listen-on-v6 { any; };
-<% else -%>
 	listen-on { ! 127.0.0.1; any; };
 	listen-on-v6 { ! ::1; any; };
-<% end -%>
 
 	allow-transfer { none; };
 	allow-update { none; };
@@ -35,9 +31,6 @@ options {
 
 <%=
   allowed='Nagios; '
-  if 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 {
@@ -67,3 +70,6 @@ logging {
 };
 
  
+<% if classes.include?('named::authoritative') -%>
+include "/etc/bind/named.conf.puppet-shared-keys";
+<% end -%>