X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fmanualroute.erb;h=899f1d999904b842de5213d5c0ec6a6a59cf8f57;hb=445298485a519129343f5009d74cb2b28a697b67;hp=4dec93c2ed180d78b61c5e83f5d38f97bae17ee5;hpb=d7ac6de1cf443d9a02794b676dfac76439008d5b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index 4dec93c2e..899f1d999 100644
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -8,17 +8,18 @@
 ## buildd.debian.org: grieg.debian.org::587 byname
 
 <%=
-mxmatches = [ scope.lookupvar('::fqdn') ]
+mxmatches = [ @fqdn ]
 routes = []
 extraroutes = []
 
-if scope.lookupvar('site::nodeinfo')['mailrelay']
+if scope.function_has_role(['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|