From: Aurelien Jarno <aurelien@aurel32.net>
Date: Wed, 21 Jun 2017 06:51:03 +0000 (+0200)
Subject: buildds: update dupload.conf
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4ddbecc39104d805e0b0a42201fa19e621e3ce85;p=mirror%2Fdsa-puppet.git

buildds: update dupload.conf

- ftp-master.d.o doesn't accept FTP upload anymore, replace it by
  ftp.upload.debian.org.
- add an anonymous-ftp-eu alias targetting ftp.eu.upload.debian.org.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/modules/buildd/files/dupload.conf b/modules/buildd/files/dupload.conf
index 952eecda7..454b8d843 100644
--- a/modules/buildd/files/dupload.conf
+++ b/modules/buildd/files/dupload.conf
@@ -9,13 +9,21 @@ $preupload{'changes'} = '/usr/share/dupload/gpg-check %1';
 $cfg{'anonymous-ftp-master'} = {
         method => "ftp",
         passive => 1,
-        fqdn => "ftp-master.debian.org",
+        fqdn => "ftp.upload.debian.org",
         incoming => "/pub/UploadQueue/",
         # files pass on to dinstall on ftp-master which sends emails itself
         dinstall_runs => 1,
 };
 $cfg{'ftp-master'} = $cfg{'anonymous-ftp-master'};
 
+$cfg{'anonymous-ftp-eu'} = {
+        fqdn => "ftp.eu.upload.debian.org",
+        passive => 1,
+        incoming => "/pub/UploadQueue/",
+        # files pass on to dinstall on ftp-master which sends emails itself
+        dinstall_runs => 1,
+};
+
 # rsync upload to ssh.upload.debian.org
 $cfg{'rsync-ftp-master'} = {
         method => "rsync",