From: Stephen Gran <steve@lobefin.net>
Date: Sun, 24 May 2009 10:25:26 +0000 (+0100)
Subject: packages.qa is on master
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5ef2b464d1c73ad67243934e5a4051d46239b575;p=mirror%2Fdsa-puppet.git

packages.qa is on master
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 5f765a144..b1eb4b11c 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -85,6 +85,7 @@ services:
   mailrelay: spohr.debian.org
   rtmaster: spohr.debian.org
   packagesmaster: powell.debian.org
+  packagesqamaster: master.debian.org
 mail_port:
   ancina.debian.org: 2025
   allegri.debian.org: 2025
diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index f6cc8b71a..89c402491 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -614,7 +614,7 @@ out
 %>
 <%=
 out=''
-if nodeinfo['packagesmaster']
+if nodeinfo['packagesqamaster']
   out='
   warn    domains  = packages.qa.debian.org
           set acl_m1 = PTSMail
@@ -808,7 +808,7 @@ out
 %>
 <%=
 out=''
-if nodeinfo['packagesmaster']
+if nodeinfo['packagesqamaster']
   out='
   deny    !hosts  = +debianhosts : 217.196.43.134
           condition = ${if eq {$acl_m1}{PTSMail}}