From: Christopher Baines <mail@cbaines.net>
To: 48435@debbugs.gnu.org
Subject: [bug#48435] [PATCH] Start enabling substitutes from bayfront.
Date: Sat, 15 May 2021 11:08:22 +0100 [thread overview]
Message-ID: <20210515100822.11784-1-mail@cbaines.net> (raw)
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.
* etc/substitutes/bayfront.guix.gnu.org.pub: New file.
* Makefile.am (dist_pkgdata_DATA): Add it.
* config-daemon.ac (guix_substitute_urls): Add https://bayfront.guix.gnu.org.
* guix/scripts/substitute.scm (%default-substitute-urls): Add
http://bayfront.guix.gnu.org.
* guix/store.scm (%default-substitute-urls): Add bayfront.guix.gnu.org.
---
Makefile.am | 3 ++-
config-daemon.ac | 2 +-
etc/substitutes/bayfront.guix.gnu.org.pub | 6 ++++++
guix/scripts/substitute.scm | 3 ++-
guix/store.scm | 3 ++-
5 files changed, 13 insertions(+), 4 deletions(-)
create mode 100644 etc/substitutes/bayfront.guix.gnu.org.pub
diff --git a/Makefile.am b/Makefile.am
index 4cbef5a6e6..bad17e59fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -584,7 +584,8 @@ check-system: $(GOBJECTS)
dist_pkgdata_DATA = \
etc/substitutes/berlin.guix.gnu.org.pub \
etc/substitutes/ci.guix.gnu.org.pub \
- etc/substitutes/ci.guix.info.pub
+ etc/substitutes/ci.guix.info.pub \
+ etc/substitutes/bayfront.guix.gnu.org.pub
# Bash completion file.
dist_bashcompletion_DATA = etc/completion/bash/guix \
diff --git a/config-daemon.ac b/config-daemon.ac
index 85caee269b..ee2ffbff42 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://bayfront.guix.gnu.org"
AC_MSG_CHECKING([for default substitute URLs])
AC_MSG_RESULT([$guix_substitute_urls])
diff --git a/etc/substitutes/bayfront.guix.gnu.org.pub b/etc/substitutes/bayfront.guix.gnu.org.pub
new file mode 100644
index 0000000000..0092301e5a
--- /dev/null
+++ b/etc/substitutes/bayfront.guix.gnu.org.pub
@@ -0,0 +1,6 @@
+(public-key
+ (ecc
+ (curve Ed25519)
+ (q #7D602902D3A2DBB83F8A0FB98602A754C5493B0B778C8D1DD4E0F41DE14DE34F#)
+ )
+ )
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index 8e4eae00b3..2fa2b1e219 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -638,7 +638,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://bayfront.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 9d706ae590..8fca37283f 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -783,7 +783,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"
+ "bayfront.guix.gnu.org")))
(define (current-user-name)
"Return the name of the calling user."
--
2.30.1
next reply other threads:[~2021-05-15 10:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-15 10:08 Christopher Baines [this message]
2021-05-15 11:01 ` [bug#48435] [PATCH] Start enabling substitutes from bayfront Mathieu Othacehe
2021-05-15 12:20 ` Christopher Baines
2021-06-07 11:07 ` [bug#48435] [PATCH v2] Start enabling substitutes from bordeaux.guix.gnu.org Christopher Baines
2021-06-08 12:14 ` [bug#48435] [PATCH v3] " Christopher Baines
2021-06-18 11:06 ` bug#48435: " Christopher Baines
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210515100822.11784-1-mail@cbaines.net \
--to=mail@cbaines.net \
--cc=48435@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.