From: Stephen Gran <steve@lobefin.net>
Date: Tue, 17 Apr 2012 07:58:20 +0000 (+0100)
Subject: start moving mx for www-master to mailhosts
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d7ac6de1cf443d9a02794b676dfac76439008d5b;p=mirror%2Fdsa-puppet.git

start moving mx for www-master to mailhosts

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

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+(.*)\.$')
diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 7f27b7bd6..eae5b6df7 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -17,7 +17,7 @@
 #    Finally the email will bounce.
 
 <%=
-vdoms = case fqdn
+vdoms = case scope.lookupvar('::fqdn')
 
         when "bellini.debian.org" then "popcon.debian.org: user=popcon group=popcon directory=/org/popcon.debian.org/mail/"