From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 9 Jun 2011 12:27:07 +0000 (+0200)
Subject: update logic in named.conf template
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4e224a4b91da96016005cb890a2eecbb76ae4b3e;p=mirror%2Fdsa-puppet.git

update logic in named.conf template
---

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index 2403fb8ed..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{draghi diamond orff senfl ravel}.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{draghi diamond orff senfl ravel}.include?(hostname)) or classes.include?('named::recursor')
+  if classes.include?('named::recursor')
     allowed += 'localnets; '
   end