X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=aa9be9b13d8b5cb590ea0c57a87035ee207a813d;hb=965a8d94b2727a7bc156ee6bb1e7a1459d8895e1;hp=6cff0291c436b33c9f9efcafb3693ae2d320b938;hpb=37a1ff5f5b3f8ddde904abde1e415617e4eeee9d;p=mirror%2Fdsa-puppet.git diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb index 6cff0291c..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{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{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