X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=aa9be9b13d8b5cb590ea0c57a87035ee207a813d;hb=53426b9c1ca14d5f0f2a8216fc6d01d080bdb329;hp=b3d6a1f1bc161c2ef3e117cbe370cab66de9687f;hpb=458639c1501a58b488d765cdcaaf745f654395af;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index b3d6a1f1b..aa9be9b13 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{orff senfl}.include?(hostname) -%>
+<% if classes.include?("named::geodns") or %w{diamond 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{orff senfl}.include?(hostname)) or classes.include?('named::recursor')
+  if (classes.include?('named::authoritative') and not %w{diamond orff senfl}.include?(hostname)) or classes.include?('named::recursor')
     allowed += 'localnets; '
   end