X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Fmanualroute.erb;h=4dec93c2ed180d78b61c5e83f5d38f97bae17ee5;hb=684f42d122d60c04f36d65d760276bb9af2bdd9b;hp=0e57849a4d57a9d985f25cb232fca49866717a08;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index 0e57849a4..4dec93c2e 100644
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -5,16 +5,17 @@
 ## Format:
 ## domain: hostname[::port] options
 ## example:
-## buildd.debian.org: raff.debian.org::587 byname
+## 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+(.*)\.$')