projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to avoid reserved site keyword
[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
cfb1a70
..
83f1f63
100644
(file)
--- a/
modules/named/templates/named.conf.options.erb
+++ b/
modules/named/templates/named.conf.options.erb
@@
-5,12
+5,16
@@
acl Nagios {
<%=
acl Nagios {
<%=
- roles = scope.lookupvar('
site
::roles')
+ roles = scope.lookupvar('
deprecated
::roles')
str = ''
roles['nagiosmaster'].each do |node|
str = ''
roles['nagiosmaster'].each do |node|
- scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
- str += "\t" + ip + "/32;\n"
- end
+ str += scope.lookupvar('deprecated::allnodeinfo')[node]['ipHostNumber'].collect do |ip|
+ if ip =~ /:/
+ "\t#{ip}/128;\n"
+ else
+ "\t#{ip}/32;\n"
+ end
+ end.join("")
end
str-%>
};
end
str-%>
};