From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 3 Apr 2011 08:45:59 +0000 (+0200)
Subject: bind should not listen on * if there is unbound installed
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e2bba642eba71459f5e125d03d3229671e6bf0ab;p=dsa-puppet.git

bind should not listen on * if there is unbound installed
---

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