<!ENTITY bugs-host "bugs.debian.org">
<!ENTITY pts-host "packages.qa.debian.org">
<!ENTITY ftp-master-host "ftp-master.debian.org">
+<!ENTITY ftp-upload-host "ftp.upload.debian.org">
+<!ENTITY ssh-upload-host "ssh.upload.debian.org">
<!ENTITY ftp-master-mirror "merkel.debian.org">
<!ENTITY upload-queue "/pub/UploadQueue/">
<title>Uploading to <literal>ftp-master</literal></title>
<para>
To upload a package, you should upload the files (including the signed changes
-and dsc-file) with anonymous ftp to <literal>&ftp-master-host;</literal> in
+and dsc-file) with anonymous ftp to <literal>&ftp-upload-host;</literal> in
the directory <ulink
-url="ftp://&ftp-master-host;&upload-queue;">&upload-queue;</ulink>.
+url="ftp://&ftp-upload-host;&upload-queue;">&upload-queue;</ulink>.
To get the files processed there, they need to be signed with a key in the
Debian Developers keyring or the Debian Maintainers keyring
(see <ulink url="&url-wiki-dm;"></ulink>).
When the specified waiting time is over, the package is moved into
the regular incoming directory for processing.
This is done through automatic uploading to
-<literal>&ftp-master-host;</literal> in upload-directory
+<literal>&ftp-upload-host;</literal> in upload-directory
<literal>DELAYED/[012345678]-day</literal>. 0-day is uploaded
-multiple times per day to <literal>&ftp-master-host;</literal>.
+multiple times per day to <literal>&ftp-upload-host;</literal>.
</para>
<para>
With dput, you can use the <literal>--delayed <replaceable>DELAY</replaceable></literal>
<title>The ftp-master server</title>
<para>
The <literal>&ftp-master-host;</literal> server holds the canonical copy of
-the Debian archive. Generally, package uploads go to this server; see
-<xref linkend="upload"/>.
+the Debian archive. Generally, package uploaded to &ftp-upload-host;
+end up on this server, see <xref linkend="upload"/>.
</para>
<para>
It is restricted; a mirror is available on <literal>merkel</literal>.
<programlisting>
$delay = ($ENV{DELAY} || 7);
$cfg{'delayed'} = {
- fqdn => "&ftp-master-host;",
+ fqdn => "&ftp-upload-host;",
login => "yourdebianlogin",
incoming => "/org/&ftp-debian-org;/incoming/DELAYED/$delay-day/",
dinstall_runs => 1,