X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fmanualroute.erb;h=10f246ac65a251f981a10ea72da18133c6e0d049;hb=8a521b84f203f89c17f65f8b7a550be088cc6764;hp=4dec93c2ed180d78b61c5e83f5d38f97bae17ee5;hpb=d7ac6de1cf443d9a02794b676dfac76439008d5b;p=dsa-puppet.git

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index 4dec93c2..10f246ac 100644
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -14,11 +14,12 @@ 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|