X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=e093aa4e86eb960d7134e1037b29fc6dd63f0faa;hb=31e494cc86cbf45b2672995ed4427e99bfcae268;hp=b584e9085d663c26d0cd9390b50cb575faa2002e;hpb=1a6db744c9afc7d01dd4d36e14c0edf5f3d0854f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index b584e9085..e093aa4e8 100644
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -20,11 +20,11 @@ options {
 	directory "/var/cache/bind";
 
 	auth-nxdomain no;    # conform to RFC1035
-<% if classes.include?("named::geodns") or %w{saens}.include(hostname) -%>
+<% if classes.include?("named::recursor") -%>
+	listen-on-v6 { any; };
+<% else -%>
 	listen-on { ! 127.0.0.1; any; };
 	listen-on-v6 { ! ::1; any; };
-<% else -%>
-	listen-on-v6 { any; };
 <% end -%>
 
 	allow-transfer { none; };
@@ -35,7 +35,7 @@ options {
 
 <%=
   allowed='Nagios; '
-  if (classes.include?('named::authoritative') and not %w{saens}.include(hostname)) or classes.include?('named::recursor')
+  if classes.include?('named::recursor')
     allowed += 'localnets; '
   end