From patchwork Sat May 15 10:08:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 29316 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 08E7527BC81; Sat, 15 May 2021 11:15:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DF4BD27BC78 for ; Sat, 15 May 2021 11:15:27 +0100 (BST) Received: from localhost ([::1]:54728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhrKR-0004Mr-3H for patchwork@mira.cbaines.net; Sat, 15 May 2021 06:15:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhrEE-0004mu-Bz for guix-patches@gnu.org; Sat, 15 May 2021 06:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36102) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lhrEE-0000pg-2z for guix-patches@gnu.org; Sat, 15 May 2021 06:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lhrED-0007Ym-Si for guix-patches@gnu.org; Sat, 15 May 2021 06:09:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48435] [PATCH] Start enabling substitutes from bayfront. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 May 2021 10:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48435 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48435@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162107332229027 (code B ref -1); Sat, 15 May 2021 10:09:01 +0000 Received: (at submit) by debbugs.gnu.org; 15 May 2021 10:08:42 +0000 Received: from localhost ([127.0.0.1]:47648 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhrDo-0007Y0-HR for submit@debbugs.gnu.org; Sat, 15 May 2021 06:08:42 -0400 Received: from lists.gnu.org ([209.51.188.17]:58790) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lhrDj-0007Xp-Bf for submit@debbugs.gnu.org; Sat, 15 May 2021 06:08:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34606) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhrDj-00040A-44 for guix-patches@gnu.org; Sat, 15 May 2021 06:08:31 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:39657) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhrDd-0000SJ-Pl for guix-patches@gnu.org; Sat, 15 May 2021 06:08:30 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id 14FC927BC78 for ; Sat, 15 May 2021 11:08:23 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 15048380 for ; Sat, 15 May 2021 10:08:22 +0000 (UTC) From: Christopher Baines Date: Sat, 15 May 2021 11:08:22 +0100 Message-Id: <20210515100822.11784-1-mail@cbaines.net> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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."