Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

[mirror/dsa-puppet.git] / modules / named / templates / named.conf.options.erb

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index 4cb466e..e093aa4 100644 (file)
--- 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") -%>
+<% 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') or classes.include?('named::recursor')
+  if classes.include?('named::recursor')
     allowed += 'localnets; '
   end