X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fmanualroute.erb;h=f45c3df3171ffcc53006657db2c0e085094b30e3;hb=396fb5c98107b9ef35f8e27e33caaa57870bc96d;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..f45c3df31 100644
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -5,20 +5,24 @@
 ## Format:
 ## domain: hostname[::port] options
 ## example:
-## buildd.debian.org: grieg.debian.org::587 byname
+## buildd.debian.org: foobar.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'
-  extraroutes = [ "keyring.debian.org:\t\tkaufmann.debian.org" ]
+  mxmatches << 'INCOMING-MX'
+  extraroutes = [ ]
   extraroutes << "www-master.debian.org:\t\twolkenstein.debian.org"
+  extraroutes << "tracker.debian.org:\t\tticharich.debian.org"
+  extraroutes << "git.debian.net:\t\tgodard.debian.net"
+  extraroutes << "godard.debian.net:\t\tgodard.debian.net"
 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|