+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
package config;
-#$preupload{'changes'} = '/usr/share/dupload/gpg-check %1';
+$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'};
-# see http://www.debian.org/devel/debian-volatile/ for more information
-$cfg{'volatile'} = {
- fqdn => "volatile-master.debian.org",
+$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,
- passive => 1,
+};
+
+# rsync upload to ssh.upload.debian.org
+$cfg{'rsync-ftp-master'} = {
+ method => "rsync",
+ login => "buildd-uploader",
+ fqdn => "ssh.upload.debian.org",
+ incoming => "/srv/upload.debian.org/UploadQueue/",
+ # files pass on to dinstall on ftp-master which sends emails itself
+ dinstall_runs => 1,
};
# For Delayed uploads use this. You can use 0-day, which is uploaded
$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,
passive => 1,
};
+$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,
-};
# Don't remove the following line. Perl needs it.
1;