[bug#48435] [PATCH v2] Start enabling substitutes from bordeaux.guix.gnu.org.

[Christopher Baines]

In addition to substitutes from ci.guix.gnu.org.  There are more changes that
can be made in the future, but these changes seem like a good start.

* config-daemon.ac (guix_substitute_urls): Add https://bordeaux.guix.gnu.org.
* guix/scripts/substitute.scm (%default-substitute-urls): Add
http://bordeaux.guix.gnu.org.
* guix/store.scm (%default-substitute-urls): Add bordeaux.guix.gnu.org.
---
 config-daemon.ac            | 2 +-
 guix/scripts/substitute.scm | 3 ++-
 guix/store.scm              | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config-daemon.ac b/config-daemon.ac
index 85caee269b..5ddc740600 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -117,7 +117,7 @@ if test "x$guix_build_daemon" = "xyes"; then
 
   dnl Determine the appropriate default list of substitute URLs (GnuTLS
   dnl is required so we can default to 'https'.)
-  guix_substitute_urls="https://ci.guix.gnu.org";
+  guix_substitute_urls="https://ci.guix.gnu.org https://bordeaux.guix.gnu.org";
 
   AC_MSG_CHECKING([for default substitute URLs])
   AC_MSG_RESULT([$guix_substitute_urls])
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index 44448ff3e9..3ea1c73e10 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -643,7 +643,8 @@ found."
     (#f
      ;; This can only happen when this script is not invoked by the
      ;; daemon.
-     '("http://ci.guix.gnu.org";))))
+     '("http://ci.guix.gnu.org";
+       "http://bordeaux.guix.gnu.org";))))
 
 ;; In order to prevent using large number of discovered local substitute
 ;; servers, limit the local substitute urls list size.
diff --git a/guix/store.scm b/guix/store.scm
index cf5d5eeccc..eaf422b615 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -775,7 +775,8 @@ encoding conversion errors."
   (map (if (false-if-exception (resolve-interface '(gnutls)))
            (cut string-append "https://"; <>)
            (cut string-append "http://"; <>))
-       '("ci.guix.gnu.org")))
+       '("ci.guix.gnu.org"
+         "bordeaux.guix.gnu.org")))
 
 (define (current-user-name)
   "Return the name of the calling user."
-- 
2.31.1