Bug#554077: Bug#554054, #554077: s/ftp-master.debian.org/ftp.upload.debian.org/ etc.

[Raphael Hertzog <hertzog@debian.org>]

tags 554054 + pending
tags 554077 + pending
thanks

On Fri, 13 Nov 2009, Simon McVittie wrote:
> Here are some proposed patches to clarify the status of upload queues, both

Applied with small tweaks:

> +<!ENTITY ftp-upload-host "ftp.upload.debian.org">

Added ssh-upload-host here as well.

>  <section id="upload-ftp-master">
> -<title>Uploading to <literal>ftp-master</literal></title>
> +<title>Uploading to <literal>&ftp-upload-host;</literal></title>

Kept the original title, we still upload to ftp-master even if we use
another service name (that might involve an intermediate jump host or
not).

>  <para>
>  The <literal>&ftp-master-host;</literal> server holds the canonical copy of
> -the Debian archive.  Generally, package uploads go to this server; see
> +the Debian archive.  Generally, package uploads go to &ftp-upload-host;,
> +which at the time of writing is an alias for &ftp-master-host;; see

I put “Generally, package uploaded to &ftp-upload-host;
+end up on this server, see <xref linkend="upload"/>.”

> -The scp queues on <literal>&ftp-master-host;</literal>, and <literal>
> -security.debian.org</literal> are mostly unusable due to the login restrictions
> -on those hosts.
> +  There is an alternative upload queue in Europe, accessed via the <ulink
> +    url="ftp://ftp.eu.upload.debian.org&upload-queue;";>&upload-queue;</ulink>
> +  directory on <literal>ftp.eu.upload.debian.org</literal>. It operates in
> +  the same way as <literal>&ftp-upload-host;</literal>, but should be faster
> +  for European developers.

Used a new entity here.

>  </para>
>  <para>
> -The anonymous queues on ftp.uni-erlangen.de and ftp.uk.debian.org are currently
> -down.  Work is underway to resurrect them.
> -</para>
> -<para>
> -The queues on master.debian.org, samosa.debian.org, master.debian.or.jp, and
> -ftp.chiark.greenend.org.uk are down permanently, and will not be resurrected.
> -The queue in Japan will be replaced with a new queue on hp.debian.or.jp some
> -day.
> +  Packages can also be uploaded via ssh to
> +  <literal>ssh.upload.debian.org</literal>; place files in the directory
> +  <literal>/srv/upload.debian.org/UploadQueue</literal>. This queue does
> +  not support <xref linkend="delayed-incoming">delayed uploads</xref>.

And here too.

Cheers,
-- 
Raphaël Hertzog