X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=aa9be9b13d8b5cb590ea0c57a87035ee207a813d;hb=fdd1e9d8391884cbfeff9492b74960eea5e3564d;hp=b584e9085d663c26d0cd9390b50cb575faa2002e;hpb=1a6db744c9afc7d01dd4d36e14c0edf5f3d0854f;p=mirror%2Fdsa-puppet.git diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb index b584e9085..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{saens}.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{saens}.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