Re: [gnu-prog-discuss] multiplexing gnu mirror

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Karl Berry on 11/17/2009 6:17 PM:
> Many of our announcements include text like this:
> 
>     Please use a mirror to reduce stress on the
>     main gnu machine:
>        http://www.gnu.org/order/ftp.html
> 
> That is good, but we can also promulgate a direct url to help reduce
> load on ftp.gnu.org: http://ftpmirror.gnu.org/PACKAGE/ redirects to a
> (supposedly) nearby and (supposedly) up-to-date mirror.
> 
> However, since the multiplexing is not and can never be perfect, it's
> good to continue to mention the explicit mirror list
> (http://www.gnu.org/order/ftp.html) as well.

Let's set a good example in gnulib, then.  This change moves some
package-agnostic items that are currently in several packages' cfg.mk into
a common location in maint.mk, while leaving room for overrides.  Does it
look okay?

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAksGm+IACgkQ84KuGfSFAYDVwwCghqPuKTXIpbJbNr1p7/M2YZFo
yhQAn0gOhHmo5J1jvZMPnY4m+0b9IMnn
=lKF9
-----END PGP SIGNATURE-----

>From c48760aa5eedc125f15e8570e3c3807c353b5a26 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Fri, 20 Nov 2009 06:23:42 -0700
Subject: [PATCH] build: mention ftp redirector in release announcements

Now that http://ftpmirror.gnu.org/PACKAGE/ redirects to a nearby
mirror, we should promote its use in release announcements.
Meanwhile, mention the mirror list.

* top/maint.mk (gnu_rel_host, url_dir_list): Provide defaults for
values that used to come from cfg.mk; mention FTP redirect URL.
* build-aux/announce-gen (get_tool_versions): Mention the mirror
list.
Suggested by Karl Berry.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog              |    9 +++++++++
 build-aux/announce-gen |    7 ++++++-
 top/maint.mk           |   14 ++++++++++++++
 3 files changed, 29 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 41eea4b..78d5704 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-20  Eric Blake  <address@hidden>
+
+       build: mention ftp redirector in release announcements
+       * top/maint.mk (gnu_rel_host, url_dir_list): Provide defaults for
+       values that used to come from cfg.mk; mention FTP redirect URL.
+       * build-aux/announce-gen (get_tool_versions): Mention the mirror
+       list.
+       Suggested by Karl Berry.
+
 2009-11-17  Eric Blake  <address@hidden>

        stdlib-safer: preserve cloexec flag for mkostemp[s]
diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index e6be9f8..5fbb9cd 100755
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
     if 0;
 # Generate a release announcement message.

-my $VERSION = '2009-10-30 15:59'; # UTC
+my $VERSION = '2009-11-20 13:36'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -442,6 +442,11 @@ EOF
   my @sig_files = map { "$_.sig" } @tarballs;
   print_locations ("GPG detached signatures[*]", @url_dir_list, %size,
                   @sig_files);
+  if ($url_dir_list[0] =~ "gnu\.org")
+    {
+      print "To reduce load on the main server, use a mirror listed at:\n";
+      print "  http://www.gnu.org/order/ftp.html\n\n";;
+    }

   $print_checksums_p
     and print_checksums (@sizable);
diff --git a/top/maint.mk b/top/maint.mk
index 34d66e1..e508c06 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -63,6 +63,20 @@ my_distdir = $(PACKAGE)-$(VERSION)
 # Old releases are stored here.
 release_archive_dir ?= ../release

+# Override gnu_rel_host and url_dir_list in cfg.mk if these are not right.
+# Use alpha.gnu.org for alpha and beta releases.
+# Use ftp.gnu.org for stable releases.
+gnu_ftp_host-alpha = alpha.gnu.org
+gnu_ftp_host-beta = alpha.gnu.org
+gnu_ftp_host-stable = ftp.gnu.org
+gnu_rel_host ?= $(gnu_ftp_host-$(RELEASE_TYPE))
+
+ifeq ($(gnu_rel_host),ftp.gnu.org)
+url_dir_list ?= http://ftpmirror.gnu.org/$(PACKAGE)
+else
+url_dir_list ?= ftp://$(gnu_rel_host)/gnu/$(PACKAGE)
+endif
+
 # Prevent programs like 'sort' from considering distinct strings to be equal.
 # Doing it here saves us from having to set LC_ALL elsewhere in this file.
 export LC_ALL = C
-- 
1.6.5.rc1