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 get rid of mxinfo again
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
manualroute.erb
diff --git
a/modules/exim/templates/manualroute.erb
b/modules/exim/templates/manualroute.erb
index
ce22a34
..
3e51534
100644
(file)
--- a/
modules/exim/templates/manualroute.erb
+++ b/
modules/exim/templates/manualroute.erb
@@
-18,8
+18,9
@@
if nodeinfo['mailrelay']
end
mxregex = Regexp.new('^\d+\s+(.*)\.$')
end
mxregex = Regexp.new('^\d+\s+(.*)\.$')
-mxinfo.keys.sort.each do |host|
- mxinfo[host]['mXRecord'].each do |mx|
+allnodeinfo.keys.sort.each do |host|
+ next unless allnodeinfo[host['mXRecord']
+ allnodeinfo[host]['mXRecord'].each do |mx|
mxmatch = mxregex.match(mx)
if mxmatches.include?(mxmatch[1])
route = host + ":\t\t" + host
mxmatch = mxregex.match(mx)
if mxmatches.include?(mxmatch[1])
route = host + ":\t\t" + host