tags 554054 + patch tags 554077 + patch thanks Here are some proposed patches to clarify the status of upload queues, both also available in <http://git.debian.org/?p=users/smcv/developers-reference.git;a=shortlog;h=refs/heads/misc>. The second depends on the first.
Regards, S From: Simon McVittie <s...@debian.org> Date: Fri, 13 Nov 2009 01:23:34 +0000 (+0000) Subject: #554054: talk about ftp.upload.debian.org, not ftp-master, for uploads X-Git-Url: http://git.debian.org/?p=users%2Fsmcv%2Fdevelopers-reference.git;a=commitdiff_plain;h=0f0ef54d6708b78f2f8d9c2703490d9f25a04f16 #554054: talk about ftp.upload.debian.org, not ftp-master, for uploads --- diff --git a/common.ent b/common.ent index 68da1fb..633ff1e 100644 --- a/common.ent +++ b/common.ent @@ -34,6 +34,7 @@ <!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 ftp-master-mirror "merkel.debian.org"> <!ENTITY upload-queue "/pub/UploadQueue/"> diff --git a/pkgs.dbk b/pkgs.dbk index d628f66..6a6822c 100644 --- a/pkgs.dbk +++ b/pkgs.dbk @@ -379,12 +379,12 @@ section</link> for details. <section id="upload"> <title>Uploading a package</title> <section id="upload-ftp-master"> -<title>Uploading to <literal>ftp-master</literal></title> +<title>Uploading to <literal>&ftp-upload-host;</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>). @@ -422,9 +422,9 @@ the deferred uploads queue"</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> diff --git a/resources.dbk b/resources.dbk index 6ecfbd9..50146a4 100644 --- a/resources.dbk +++ b/resources.dbk @@ -275,7 +275,8 @@ reduce unnecessary duplication of effort or wasted processing time. <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 +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 <xref linkend="upload"/>. </para> <para> @@ -939,7 +940,7 @@ snippet to your configuration file: <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, From: Simon McVittie <s...@debian.org> Date: Fri, 13 Nov 2009 01:36:46 +0000 (+0000) Subject: #554077: don't mention dead upload queues, but do mention ftp.eu.upload and ssh.upload X-Git-Url: http://git.debian.org/?p=users%2Fsmcv%2Fdevelopers-reference.git;a=commitdiff_plain;h=17c7315c933141416cd82ef6d5843753e3bb48ff #554077: don't mention dead upload queues, but do mention ftp.eu.upload and ssh.upload --- diff --git a/pkgs.dbk b/pkgs.dbk index f33f18f..93782c2 100644 --- a/pkgs.dbk +++ b/pkgs.dbk @@ -447,19 +447,17 @@ see section <xref linkend="bug-security"/> . <section id="s5.6.5"> <title>Other upload queues</title> <para> -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. </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>. </para> </section>
signature.asc
Description: Digital signature
