X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=e093aa4e86eb960d7134e1037b29fc6dd63f0faa;hb=31447ef91aa6f77a5d74457a94c1f4e172f32a4d;hp=f80122285de44d762e3cbc701fcd1b2a48ab2e38;hpb=98e2801edd59d7ffe82d2fe8bda10727d3079263;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index f80122285..e093aa4e8 100644
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -20,7 +20,12 @@ 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; };
@@ -30,7 +35,7 @@ options {
 
 <%=
   allowed='Nagios; '
-  if classes.include?('named::authoritative') or classes.include?('named::recursor')
+  if classes.include?('named::recursor')
     allowed += 'localnets; '
   end