projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "squeeze uses --manage-gids to rpc.mountd by default - that seems to make...
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
manualroute.erb
diff --git
a/modules/exim/templates/manualroute.erb
b/modules/exim/templates/manualroute.erb
index
9f78c16
..
40062d8
100644
(file)
--- a/
modules/exim/templates/manualroute.erb
+++ b/
modules/exim/templates/manualroute.erb
@@
-12,15
+12,15
@@
mxmatches = [ fqdn ]
routes = []
extraroutes = []
routes = []
extraroutes = []
-case fqdn
-when 'spohr.debian.org', 'draghi.debian.org', 'merikanto.debian.org' then
+if nodeinfo['mailrelay']
mxmatches << 'mailout.debian.org'
mxmatches << 'mailout.debian.org'
- extraroutes = [
'keyring.debian.org:\t\tkaufmann.debian.org'
]
+ extraroutes = [
"keyring.debian.org:\t\tkaufmann.debian.org"
]
end
mxregex = Regexp.new('^\d+\s+(.*)\.$')
end
mxregex = Regexp.new('^\d+\s+(.*)\.$')
-mxinfo.keys.sort.each do |host|
- mxinfo[host][0]['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