X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Ffiles%2Fdupload.conf;h=581353880bbfc4771e8c6ea2bc9f3dfb11a73b94;hb=2972577c62e8dfa15c111d5072b5755c3d1550e3;hp=37f1ef84533eb276eb6e6e7435c980f61acbcce7;hpb=70053242c812da4b93a7cbdb4d64d47d8c571aaf;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/files/dupload.conf b/modules/buildd/files/dupload.conf
index 37f1ef845..581353880 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",
@@ -48,7 +56,7 @@ $cfg{'mentors'} = {
 
 
 $cfg{'anonymous-security'} = {
-        fqdn => "security-master.debian.org",
+        fqdn => "ftp.security.upload.debian.org",
         incoming => "/pub/SecurityUploadQueue",
         # files pass on to dinstall on security which sends emails itself
         dinstall_runs => 1,
@@ -56,6 +64,17 @@ $cfg{'anonymous-security'} = {
 };
 $cfg{'security'} = $cfg{'anonymous-security'};
 
+# rsync upload to ssh.security.upload.debian.org
+$cfg{'rsync-security'} = {
+        method => "rsync",
+        login => "buildd-uploader",
+        fqdn => "ssh.security.upload.debian.org",
+        incoming => "/srv/security.upload.debian.org/SecurityUploadQueue/",
+        # files pass on to dinstall on ftp-master which sends emails itself
+        dinstall_runs => 1,
+};
+
+
 # Don't remove the following line.  Perl needs it.
 1;