]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
packages.qa is on master
authorStephen Gran <steve@lobefin.net>
Sun, 24 May 2009 10:25:26 +0000 (11:25 +0100)
committerStephen Gran <steve@lobefin.net>
Sun, 24 May 2009 10:25:26 +0000 (11:25 +0100)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/debian-org/misc/local.yaml
modules/exim/templates/eximconf.erb

index 5f765a144c107b004c8c888e47370bc99e5bfcbb..b1eb4b11c5c3a6bc8be8ee0ae10e8be53da2bdef 100644 (file)
@@ -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
index f6cc8b71a9d0f353233cdd88499926f8e4873305..89c402491cc3bb09164d2697a22facc833b2d602 100644 (file)
@@ -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}}