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

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index 7b6813f24..4dec93c2e 100644
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -8,13 +8,14 @@
 ## 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'
   extraroutes = [ "keyring.debian.org:\t\tkaufmann.debian.org" ]
+  extraroutes << "www-master.debian.org:\t\twolkenstein.debian.org"
 end
 
 mxregex = Regexp.new('^\d+\s+(.*)\.$')