projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use the correct parameter
[mirror/dsa-puppet.git]
/
modules
/
named
/
templates
/
named.conf.options.erb
diff --git
a/modules/named/templates/named.conf.options.erb
b/modules/named/templates/named.conf.options.erb
index
8bc2f87
..
72ef825
100644
(file)
--- a/
modules/named/templates/named.conf.options.erb
+++ b/
modules/named/templates/named.conf.options.erb
@@
-5,13
+5,12
@@
acl Nagios {
<%=
acl Nagios {
<%=
+ roles = scope.lookupvar('site::roles')
str = ''
str = ''
- scope.lookupvar('site::localinfo').keys.sort.each do |node|
- if scope.lookupvar('site::localinfo')[node]['nagiosmaster']
+ roles['nagiosmaster'].each do |node|
scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
str += "\t" + ip + "/32;\n"
end
scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
str += "\t" + ip + "/32;\n"
end
- end
end
str-%>
};
end
str-%>
};
@@
-43,7
+42,7
@@
options {
dnssec-validation yes;
<% end -%>
dnssec-validation yes;
<% end -%>
-<% if
%w{senfl ravel orff diamond rietz}.include?(hostname
) -%>
+<% if
scope.function_has_role(['dns_secondary']
) -%>
rate-limit {
responses-per-second 25;
window 5;
rate-limit {
responses-per-second 25;
window 5;
@@
-70,3
+69,6
@@
logging {
};
};
+<% if classes.include?('named::authoritative') -%>
+include "/etc/bind/named.conf.puppet-shared-keys";
+<% end -%>