X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=b3d6a1f1bc161c2ef3e117cbe370cab66de9687f;hb=da2cef293cdd414736ea53434bdba8e98c23676c;hp=4cb466ea254225f91e0fc60a571a54e294b60c75;hpb=7fbd1fb63f9a8e87683b183e8b39bce18af59a4a;p=mirror%2Fdsa-puppet.git diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb index 4cb466ea2..b3d6a1f1b 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") -%> +<% 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') 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