projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ignore newer yaboots on the PPCs
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
manualroute.erb
diff --git
a/modules/exim/templates/manualroute.erb
b/modules/exim/templates/manualroute.erb
index
c798cc9
..
40062d8
100644
(file)
--- a/
modules/exim/templates/manualroute.erb
+++ b/
modules/exim/templates/manualroute.erb
@@
-9,16
+9,18
@@
<%=
mxmatches = [ fqdn ]
<%=
mxmatches = [ fqdn ]
-case fqdn
-when 'spohr.debian.org', 'draghi.debian.org', 'merikanto.debian.org' then
+routes = []
+extraroutes = []
+
+if nodeinfo['mailrelay']
mxmatches << 'mailout.debian.org'
mxmatches << 'mailout.debian.org'
+ extraroutes = [ "keyring.debian.org:\t\tkaufmann.debian.org" ]
end
end
-routes = []
-
mxregex = Regexp.new('^\d+\s+(.*)\.$')
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
@@
-30,5
+32,7
@@
mxinfo.keys.sort.each do |host|
end
end
end
end
+routes << extraroutes
+
routes.join("\n")
%>
routes.join("\n")
%>