From debbugs-submit-bounces@debbugs.gnu.org Fri May 31 05:13:11 2024 Received: (at submit) by debbugs.gnu.org; 31 May 2024 09:13:11 +0000 Received: from localhost ([127.0.0.1]:53158 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCyJy-0003B5-Qr for submit@debbugs.gnu.org; Fri, 31 May 2024 05:13:11 -0400 Received: from lists.gnu.org ([209.51.188.17]:43766) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCyJt-0003At-JU for submit@debbugs.gnu.org; Fri, 31 May 2024 05:13:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sCyJi-0000R9-58 for guix-patches@gnu.org; Fri, 31 May 2024 05:12:54 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sCyJg-00066m-Tz; Fri, 31 May 2024 05:12:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=fN6k6wlUDj4shtWZjUevKvp50J01ui9w+zi3cjrx2gM=; b=lIaYVC2rJHoPFT sHvJSQHeyvsPRG05P61v2bMXmLWt2n/4SxRPh1mrV9Fl5GBvD0tbJYIZA+w8j14ZgEF2x/c9mFhlW ImahW6oWQWJVFWjSQR0LjGc7Exa8rCsOHa2p5CCOoNRNEXejZgRZSkuqJyDhardBPMoUtOX5ltCgp O+nToQ44dMIY9NMj2l9OOY09D/6gK7ZFArfTXdIQLyfI6ZZqbelIuq1b8AvLs3LMEPWuN9CzYpcEy TrQHcMX4p+7AF0/qlnFOmGEqYFW639je40Afrkq/d3BSoTNmxiMkA5mpyihBZq99Tnx2X74I0rMtE Wa/0/GZaQMM+fuwjZTvA==; From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: guix-patches@gnu.org Subject: [PATCH] =?UTF-8?q?etc:=20Add=20explicit=20=E2=80=98--substitute-u?= =?UTF-8?q?rls=E2=80=99=20in=20guix-daemon=20service=20files.?= Date: Fri, 31 May 2024 11:12:45 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Having substitute URLs explicitly listed in the service startup file makes it clearer what should be modified to permanently change the list of substitute URLs. * config-daemon.ac: Rename ‘guix_substitute_urls’ to ‘GUIX_SUBSTITUTE_URLS’ and substitute it. * nix/local.mk (etc/guix-%.service, etc/init.d/guix-daemon) (etc/guix-%.conf): Substitute it. * etc/guix-daemon.conf.in, etc/guix-daemon.service.in, etc/init.d/guix-daemon.in: Add an explicit ‘--substitute-urls’ option. Change-Id: Ie491b7fab5c42e54dca582801c03805a85de2bf9 --- config-daemon.ac | 7 ++++--- etc/guix-daemon.conf.in | 2 +- etc/guix-daemon.service.in | 3 ++- etc/init.d/guix-daemon.in | 4 +++- nix/local.mk | 17 ++++++++++------- 5 files changed, 20 insertions(+), 13 deletions(-) Hello! The goal is to improve transparency: one will now easily see in their .service file (or similar) where the URLs are, allowing them to add new URLs without first having to look up the Guix manual for the right option and then the systemd (or similar) manual for the right syntax. Thoughts? Ludo’. diff --git a/config-daemon.ac b/config-daemon.ac index 9188f93bda8..9854f1d694f 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -106,12 +106,13 @@ 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://bordeaux.guix.gnu.org https://ci.guix.gnu.org" + GUIX_SUBSTITUTE_URLS="https://bordeaux.guix.gnu.org https://ci.guix.gnu.org" AC_MSG_CHECKING([for default substitute URLs]) - AC_MSG_RESULT([$guix_substitute_urls]) + AC_MSG_RESULT([$GUIX_SUBSTITUTE_URLS]) + AC_SUBST([GUIX_SUBSTITUTE_URLS]) - AC_DEFINE_UNQUOTED([GUIX_SUBSTITUTE_URLS], ["$guix_substitute_urls"], + AC_DEFINE_UNQUOTED([GUIX_SUBSTITUTE_URLS], ["$GUIX_SUBSTITUTE_URLS"], [Default list of substitute URLs used by 'guix-daemon'.]) dnl Check for Guile-SSH, which is required by 'guix offload'. diff --git a/etc/guix-daemon.conf.in b/etc/guix-daemon.conf.in index fb681d1f802..aa368d6272c 100644 --- a/etc/guix-daemon.conf.in +++ b/etc/guix-daemon.conf.in @@ -7,4 +7,4 @@ start on runlevel [2345] stop on runlevel [016] -exec @localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon --build-users-group=guixbuild --discover=no +exec @localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon --build-users-group=guixbuild --discover=no --substitute-urls='@GUIX_SUBSTITUTE_URLS@' diff --git a/etc/guix-daemon.service.in b/etc/guix-daemon.service.in index 5e75379b5e4..5c43d9b7f1b 100644 --- a/etc/guix-daemon.service.in +++ b/etc/guix-daemon.service.in @@ -7,7 +7,8 @@ Description=Build daemon for GNU Guix [Service] ExecStart=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon \ - --build-users-group=guixbuild --discover=no + --build-users-group=guixbuild --discover=no \ + --substitute-urls='@GUIX_SUBSTITUTE_URLS@' Environment='GUIX_LOCPATH=@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale' LC_ALL=en_US.utf8 StandardOutput=journal StandardError=journal diff --git a/etc/init.d/guix-daemon.in b/etc/init.d/guix-daemon.in index b7d4bb72bbb..913210a5434 100644 --- a/etc/init.d/guix-daemon.in +++ b/etc/init.d/guix-daemon.in @@ -36,7 +36,9 @@ start) -E LC_ALL=en_US.utf8 \ -p "/var/run/guix-daemon.pid" \ @localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon \ - --build-users-group=guixbuild --discover=no + --build-users-group=guixbuild --discover=no \ + --substitute-urls='@GUIX_SUBSTITUTE_URLS@' + fi ;; stop) diff --git a/nix/local.mk b/nix/local.mk index 44a26dd2c8f..8a2b2b88e86 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020 Ludovic Courtès +# Copyright © 2012-2016, 2018-2020, 2024 Ludovic Courtès # Copyright © 2016 Mathieu Lirzin # Copyright © 2020 Tobias Geerinckx-Rice # @@ -166,8 +166,9 @@ etc/%.mount: etc/%.mount.in \ etc/guix-%.service: etc/guix-%.service.in \ $(top_builddir)/config.status $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ - $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' < \ - "$<" > "$@.tmp"; \ + $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' \ + -e 's|@''GUIX_SUBSTITUTE_URLS''@|$(GUIX_SUBSTITUTE_URLS)|' \ + < "$<" > "$@.tmp"; \ mv "$@.tmp" "$@" # The service script for sysvinit. @@ -177,8 +178,9 @@ nodist_sysvinitservice_DATA = etc/init.d/guix-daemon etc/init.d/guix-daemon: etc/init.d/guix-daemon.in \ $(top_builddir)/config.status $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ - $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' < \ - "$<" > "$@.tmp"; \ + $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' \ + -e 's|@''GUIX_SUBSTITUTE_URLS''@|$(GUIX_SUBSTITUTE_URLS)|' \ + < "$<" > "$@.tmp"; \ mv "$@.tmp" "$@" # The service script for openrc. @@ -199,8 +201,9 @@ nodist_upstartjob_DATA = etc/guix-daemon.conf etc/guix-publish.conf etc/guix-%.conf: etc/guix-%.conf.in \ $(top_builddir)/config.status $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ - $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' < \ - "$<" > "$@.tmp"; \ + $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' \ + -e 's|@''GUIX_SUBSTITUTE_URLS''@|$(GUIX_SUBSTITUTE_URLS)|' \ + < "$<" > "$@.tmp"; \ mv "$@.tmp" "$@" CLEANFILES += \ base-commit: cca25a67693bb68a1884a081b415a43fad1e8641 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 26 18:23:10 2024 Received: (at 71287-done) by debbugs.gnu.org; 26 Jun 2024 22:23:10 +0000 Received: from localhost ([127.0.0.1]:40558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMb2j-0003C9-O9 for submit@debbugs.gnu.org; Wed, 26 Jun 2024 18:23:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60994) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMb2i-0003BW-1g for 71287-done@debbugs.gnu.org; Wed, 26 Jun 2024 18:23:08 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMb2a-0002Qu-8E for 71287-done@debbugs.gnu.org; Wed, 26 Jun 2024 18:23:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=uWC/jyUUaKxLfmELMIH1xE5FFfuqTYtR6NgN9BV6hCc=; b=cdl721MlB1TV/j6OpPgh R69j9CUAKB4mPV7v7bvvy+lu0Ekm9fpAaQ0c2Mwc1kwbLlHqG0csgGrCD1HrnWY2entYNWNi6p+wN c0bv4AFs2Zs3jSlG/nSJC9xmxDFeYgOZahaDh1axJbQoH4xiesQCQUt/1XucD2Ncg7gHTnnfrxpgs hUwy0EZNSsCf+QnwwDDSKUva6RKPbjipmMV3h9vZZNpM42vrohUupU6Z1tPCWBPCB4nP8eFzxzSaR E06Kvy+/Ad5fX/wHAs8CvoonZ3Fkz8cThEHA5IrD7zDat/bo/c8Un0zNb6YLQf3/u1NgJHIAQ2jmW Y5RdsQxc62K1zQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: 71287-done@debbugs.gnu.org Subject: Re: [bug#71287] [PATCH] etc: Add explicit =?utf-8?Q?=E2=80=98--su?= =?utf-8?Q?bstitute-urls=E2=80=99?= in guix-daemon service files. In-Reply-To: ("Ludovic =?utf-8?Q?Court=C3=A8s=22's?= message of "Fri, 31 May 2024 11:12:45 +0200") References: Date: Thu, 27 Jun 2024 00:22:58 +0200 Message-ID: <87bk3n9we5.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 71287-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s skribis: > Having substitute URLs explicitly listed in the service startup file > makes it clearer what should be modified to permanently change the list > of substitute URLs. > > * config-daemon.ac: Rename =E2=80=98guix_substitute_urls=E2=80=99 to > =E2=80=98GUIX_SUBSTITUTE_URLS=E2=80=99 and substitute it. > * nix/local.mk (etc/guix-%.service, etc/init.d/guix-daemon) > (etc/guix-%.conf): Substitute it. > * etc/guix-daemon.conf.in, etc/guix-daemon.service.in, > etc/init.d/guix-daemon.in: Add an explicit =E2=80=98--substitute-urls=E2= =80=99 option. > > Change-Id: Ie491b7fab5c42e54dca582801c03805a85de2bf9 I went ahead and pushed this as d11b96eb5493231a5a35045505ff8ae8aa746b8e. Ludo=E2=80=99. From unknown Fri Jun 20 19:53:12 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 25 Jul 2024 11:24:15 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator