Merge branch 'zobel-salsa'

[mirror/dsa-puppet.git] / modules / buildd / files / dupload.conf

diff --git a/modules/buildd/files/dupload.conf b/modules/buildd/files/dupload.conf
index d23648c..5813538 100644 (file)
--- 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",
@@ -26,15 +34,6 @@ $cfg{'rsync-ftp-master'} = {
         dinstall_runs => 1,
 };
 
-# see http://www.debian.org/devel/debian-volatile/ for more information
-$cfg{'volatile'} = {
-        fqdn => "volatile-master.debian.org",
-        incoming => "/pub/UploadQueue/",
-        # files pass on to dinstall on ftp-master which sends emails itself
-        dinstall_runs => 1,
-        passive => 1,
-};
-
 # For Delayed uploads use this. You can use 0-day, which is uploaded
 # one hour before dinstall runs.
 $delay = (defined($ENV{DEBDELAY}) ? $ENV{DEBDELAY} : 7);
@@ -57,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,
@@ -65,20 +64,16 @@ $cfg{'anonymous-security'} = {
 };
 $cfg{'security'} = $cfg{'anonymous-security'};
 
-$cfg{'debian-edu'} = {
-        fqdn => "ftp.skolelinux.org",
-        incoming => "/pub/UploadQueue",
+# 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,
-        passive => 1,
 };
 
-$cfg{'bpo'} = {
-        fqdn => "backports-master.debian.org",
-        incoming => "/pub/UploadQueue",
-        dinstall_runs => 1,
-        passive => 1,
-};
-$cfg{'backports'} = $cfg{'bpo'};
 
 # Don't remove the following line.  Perl needs it.
 1;