X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fmanualroute.erb;h=70cefe91acd176c01bb3bff88a4cd508e52f02c8;hb=355a8f07e8eb7052cf51e0193b24ea829bac1a4c;hp=21a194edaa708b46cea755ad8291c8f7d8ed1899;hpb=f833a1c122597f80da4d4095cae8d7d5bd852a7a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index 21a194eda..70cefe91a 100644
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -5,18 +5,20 @@
 ## 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.function_has_role('mailrelay')
+if scope.function_has_role(['mailrelay'])
   mxmatches << 'mailout.debian.org'
   mxmatches << 'INCOMING-MX'
-  extraroutes = [ "keyring.debian.org:\t\tkaufmann.debian.org" ]
+  extraroutes = [ ]
   extraroutes << "www-master.debian.org:\t\twolkenstein.debian.org"
+  extraroutes << "tracker.debian.org:\t\tticharich.debian.org"
+  extraroutes << "salsa.debian.org:\t\tgodard.debian.org"
 end
 
 mxregex = Regexp.new('^\d+\s+(.*?)\.?$')