X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=72ef825845894f64e0e0d80380891829000d3f7e;hb=18066df35f30b2cdb36d12ad84e9f1a5f911c7d4;hp=294cbb041f570861b72462ab2858eb68691db00d;hpb=816f97a070a1f8e1d2b89492697a7d9288ffe846;p=dsa-puppet.git diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb index 294cbb04..72ef8258 100644 --- a/modules/named/templates/named.conf.options.erb +++ b/modules/named/templates/named.conf.options.erb @@ -5,13 +5,12 @@ acl Nagios { <%= + roles = scope.lookupvar('site::roles') str = '' - localinfo.keys.sort.each do |node| - if localinfo[node]['nagiosmaster'] - allnodeinfo[node]['ipHostNumber'].each do |ip| + roles['nagiosmaster'].each do |node| + scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip| str += "\t" + ip + "/32;\n" end - end end str-%> }; @@ -20,12 +19,8 @@ options { directory "/var/cache/bind"; auth-nxdomain no; # conform to RFC1035 -<% if classes.include?("named::geodns") or %w{senfl}.include?(hostname) -%> listen-on { ! 127.0.0.1; any; }; listen-on-v6 { ! ::1; any; }; -<% else -%> - listen-on-v6 { any; }; -<% end -%> allow-transfer { none; }; allow-update { none; }; @@ -35,9 +30,6 @@ options { <%= allowed='Nagios; ' - if (classes.include?('named::authoritative') and not %w{senfl}.include?(hostname)) or classes.include?('named::recursor') - allowed += 'localnets; ' - end str = "\tallow-recursion { " + allowed + " };\n" str += "\tallow-query { " + allowed + " };\n" @@ -49,6 +41,16 @@ options { dnssec-enable yes; dnssec-validation yes; <% end -%> + +<% if scope.function_has_role(['dns_secondary']) -%> + rate-limit { + responses-per-second 25; + window 5; + slip 5; + qps-scale 250; + }; +<% end -%> + }; logging { @@ -67,3 +69,6 @@ logging { }; +<% if classes.include?('named::authoritative') -%> +include "/etc/bind/named.conf.puppet-shared-keys"; +<% end -%>