Accept INCOMING-MX as ldap mxrecord entry for exim's manualroute

[dsa-puppet.git] / modules / exim / templates / manualroute.erb

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index 7b6813f2482c2e9b075197ced7750a3f199b2dcd..10f246ac65a251f981a10ea72da18133c6e0d049 100644 (file)
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -8,16 +8,18 @@
 ## buildd.debian.org: grieg.debian.org::587 byname
 
 <%=
-mxmatches = [ fqdn ]
+mxmatches = [ scope.lookupvar('::fqdn') ]
 routes = []
 extraroutes = []
 
 if scope.lookupvar('site::nodeinfo')['mailrelay']
   mxmatches << 'mailout.debian.org'
+  mxmatches << 'INCOMING-MX'
   extraroutes = [ "keyring.debian.org:\t\tkaufmann.debian.org" ]
+  extraroutes << "www-master.debian.org:\t\twolkenstein.debian.org"
 end
 
-mxregex = Regexp.new('^\d+\s+(.*)\.$')
+mxregex = Regexp.new('^\d+\s+(.*?)\.?$')
 scope.lookupvar('site::allnodeinfo').keys.sort.each do |host|
   next unless scope.lookupvar('site::allnodeinfo')[host]['mXRecord']
   scope.lookupvar('site::allnodeinfo')[host]['mXRecord'].each do |mx|