From unknown Sun Jun 22 22:44:59 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75533] [PATCH v2] services: dns: Minor cleanup of unbound service. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Jan 2025 06:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 75533 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75533@debbugs.gnu.org Cc: ludo@gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17367487923093 (code B ref -1); Mon, 13 Jan 2025 06:14:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Jan 2025 06:13:12 +0000 Received: from localhost ([127.0.0.1]:49895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tXDhH-0000no-Ky for submit@debbugs.gnu.org; Mon, 13 Jan 2025 01:13:12 -0500 Received: from lists.gnu.org ([2001:470:142::17]:49256) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tXDhF-0000nb-1S for submit@debbugs.gnu.org; Mon, 13 Jan 2025 01:13:09 -0500 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 1tXDh9-0003bF-Bq for guix-patches@gnu.org; Mon, 13 Jan 2025 01:13:03 -0500 Received: from magnesium.8pit.net ([2001:19f0:6c01:4ae:5400:ff:fe66:af9d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tXDh7-00082J-An; Mon, 13 Jan 2025 01:13:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=O0tIiFkb S6OljkMq8Z9f+zuU9X4dQOGoGLVqwTS3Nc4=; h=date:subject:cc:to:from; d=soeren-tempel.net; b=HC3vUSQ4PvcH2zA5h4srMezA0e+1H2CBRQ5vuKhLCNPu5YJ O2m/slleAJS2EV/CNhgUlaOGlburcfxeJllgrpksF89DLFgfdQl5jfIftPrVQi1xXE2HoF +7C6zQRzwOk47zxOnGZHh+CigJrY5pd519oC6Olh0C6YBcmvx5qLzE= Received: from localhost ( [2a02:560:4d3d:df00:625c:9e71:7750:882]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 14b7dba4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Mon, 13 Jan 2025 07:12:50 +0100 (CET) From: soeren@soeren-tempel.net Date: Mon, 13 Jan 2025 07:12:43 +0100 Message-ID: X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2001:19f0:6c01:4ae:5400:ff:fe66:af9d; envelope-from=soeren@soeren-tempel.net; helo=magnesium.8pit.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) 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: -0.1 (/) From: Sören Tempel In #68757, v3 instead of v4 of the patchset was committed by accident. This patch revives the (minor) changes made in the v4. * gnu/service/dns.scm: Remove exports of no longer existing names. (unbound-service-type): Fix at typo (unbound -> Unbound). (unbound-shepherd-service): Run after user processes. (unbound-account-service): Determine shell based on shadow package. --- gnu/services/dns.scm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index c74001fac29..dcfb90235c1 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -56,18 +56,14 @@ (define-module (gnu services dns) dnsmasq-configuration unbound-service-type - unbound-zone - unbound-server unbound-configuration unbound-configuration? - unbound-configuration-server - unbound-configuration-remote-control - unbound-configuration-forward-zone - unbound-configuration-stub-zone - unbound-configuration-auth-zone - unbound-configuration-view - unbound-configuration-python - unbound-configuration-dynlib)) + unbound-server + unbound-server? + unbound-zone + unbound-zone? + unbound-remote + unbound-remote?)) ;;; ;;; Knot DNS. @@ -1065,7 +1061,9 @@ (define (unbound-shepherd-service config) (list (shepherd-service (documentation "Unbound daemon.") (provision '(unbound dns)) - (requirement '(networking)) + ;; unbound may be bound to a particular IP address, hence + ;; only start it after the networking service has started. + (requirement '(user-processes networking)) (actions (list (shepherd-configuration-action config-file))) (start #~(make-forkexec-constructor (list (string-append #$unbound "/sbin/unbound") @@ -1080,11 +1078,11 @@ (define unbound-account-service (system? #t) (comment "Unbound daemon user") (home-directory "/var/empty") - (shell "/run/current-system/profile/sbin/nologin")))) + (shell (file-append shadow "/sbin/nologin"))))) (define unbound-service-type (service-type (name 'unbound) - (description "Run the unbound DNS resolver.") + (description "Run the Unbound DNS resolver.") (extensions (list (service-extension account-service-type (const unbound-account-service)) base-commit: 4fef7b26941940515533b4b463b505b28567afe6 From unknown Sun Jun 22 22:44:59 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75533] [PATCH v2] services: dns: Minor cleanup of unbound service. References: In-Reply-To: Resent-From: =?UTF-8?Q?S=C3=B6ren?= Tempel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Jan 2025 18:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75533 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75533@debbugs.gnu.org Received: via spool by 75533-submit@debbugs.gnu.org id=B75533.173679232113782 (code B ref 75533); Mon, 13 Jan 2025 18:19:02 +0000 Received: (at 75533) by debbugs.gnu.org; 13 Jan 2025 18:18:41 +0000 Received: from localhost ([127.0.0.1]:52813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tXP1N-0003aE-Fa for submit@debbugs.gnu.org; Mon, 13 Jan 2025 13:18:41 -0500 Received: from magnesium.8pit.net ([45.76.88.171]:17636) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tXP1L-0003a5-Od for 75533@debbugs.gnu.org; Mon, 13 Jan 2025 13:18:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=XMIdYAhA ps7u3yxPBiaE3g9jSzJXoTh0R2nvHhmU4mo=; h=from:subject:to:date; d=soeren-tempel.net; b=Vs0nIMVmjB9hIYNbfKX5d7HxqJYGDJJHLAGe3UeQ+yFN50C Dt75wj+izlqp/yFp0/cgzYw5svMV9VMh2lnyuotafbGtMuAChyy4/TYy20A30H/+7GUwVD Y+B9/LUs4G3uppfQTX8yU6xAbuoQlKoF/upq2cl/YHysNcwRw+e1y4= Received: from localhost ( [2a02:560:4d3d:df00:4fe7:d7be:f3b3:38d3]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 665e1e3e (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES) for <75533@debbugs.gnu.org>; Mon, 13 Jan 2025 19:18:38 +0100 (CET) Date: Mon, 13 Jan 2025 19:18:37 +0100 From: =?UTF-8?Q?S=C3=B6ren?= Tempel Message-Id: <25L9L65UEX76Z.2E02UHFIIB3GK@8pit.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) 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: -1.0 (-) Somehow, Guix QA still uses an old base commit (af0d981c0ade9662eeffe7f4f7dbb018e15a87e9) that pre-dates the addition of the Unbound service, hence QA is failing as the patch doesn't apply. From unknown Sun Jun 22 22:44:59 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: soeren@soeren-tempel.net Subject: bug#75533: closed (Re: bug#75533: [PATCH v2] services: dns: Minor cleanup of unbound service.) Message-ID: References: <87h65z6uzf.fsf@gnu.org> X-Gnu-PR-Message: they-closed 75533 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 75533@debbugs.gnu.org Date: Thu, 16 Jan 2025 08:10:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1737015002-2496-1" This is a multi-part message in MIME format... ------------=_1737015002-2496-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #75533: [PATCH v2] services: dns: Minor cleanup of unbound service. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 75533@debbugs.gnu.org. --=20 75533: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D75533 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1737015002-2496-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 75533-done) by debbugs.gnu.org; 16 Jan 2025 08:09:22 +0000 Received: from localhost ([127.0.0.1]:59895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tYKwM-0000d6-8B for submit@debbugs.gnu.org; Thu, 16 Jan 2025 03:09:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52266) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tYKwJ-0000cn-RX for 75533-done@debbugs.gnu.org; Thu, 16 Jan 2025 03:09:20 -0500 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 1tYKwA-0001N5-1X; Thu, 16 Jan 2025 03:09:11 -0500 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=JWzpHGzJ9yFkixm3cHFD/RXSsp176HJZsIV8/w7w4wA=; b=fPjKqErVnWwVz+NP5N7B m4IypZfWepLNUFpeazf5T7ykQs7ptc/tsCN6hkqMngDfoVNdcoEJ11cn3BV/Zo/P6WtUxFaWU0Qg7 AMRwJsv58SDnXJczjF+gIZeD6Y0l2E+X9PzaC1BijGgSqPBQoGmmZqB44H2BugnNzpFlbmjzcToI3 29kRkyLfdHeGssBtLJ8VxaTPNOeOap8OCKYdJ5NLcaLJd8rirFppC4uYdIl9oepIvIY4vmMzJfcID Rfpt0mJGsvl+OqqmAqyUjtrIawnQ7IPvNegGvWdJsnVeohc8+H202LjgejgoIN5EKQYPdN7lEPlbt PbOZRWmEwOv3iQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: soeren@soeren-tempel.net Subject: Re: bug#75533: [PATCH v2] services: dns: Minor cleanup of unbound service. In-Reply-To: (soeren@soeren-tempel.net's message of "Mon, 13 Jan 2025 07:12:43 +0100") References: Date: Thu, 16 Jan 2025 09:09:08 +0100 Message-ID: <87h65z6uzf.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: 75533-done Cc: 75533-done@debbugs.gnu.org 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 (---) soeren@soeren-tempel.net skribis: > From: S=C3=B6ren Tempel > > In #68757, v3 instead of v4 of the patchset was committed by accident. > This patch revives the (minor) changes made in the v4. > > * gnu/service/dns.scm: Remove exports of no longer existing names. > (unbound-service-type): Fix at typo (unbound -> Unbound). > (unbound-shepherd-service): Run after user processes. > (unbound-account-service): Determine shell based on shadow package. Applied, thanks. And apologies for picking the wrong version in the first place! Ludo=E2=80=99. ------------=_1737015002-2496-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 13 Jan 2025 06:13:12 +0000 Received: from localhost ([127.0.0.1]:49895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tXDhH-0000no-Ky for submit@debbugs.gnu.org; Mon, 13 Jan 2025 01:13:12 -0500 Received: from lists.gnu.org ([2001:470:142::17]:49256) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tXDhF-0000nb-1S for submit@debbugs.gnu.org; Mon, 13 Jan 2025 01:13:09 -0500 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 1tXDh9-0003bF-Bq for guix-patches@gnu.org; Mon, 13 Jan 2025 01:13:03 -0500 Received: from magnesium.8pit.net ([2001:19f0:6c01:4ae:5400:ff:fe66:af9d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tXDh7-00082J-An; Mon, 13 Jan 2025 01:13:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=O0tIiFkb S6OljkMq8Z9f+zuU9X4dQOGoGLVqwTS3Nc4=; h=date:subject:cc:to:from; d=soeren-tempel.net; b=HC3vUSQ4PvcH2zA5h4srMezA0e+1H2CBRQ5vuKhLCNPu5YJ O2m/slleAJS2EV/CNhgUlaOGlburcfxeJllgrpksF89DLFgfdQl5jfIftPrVQi1xXE2HoF +7C6zQRzwOk47zxOnGZHh+CigJrY5pd519oC6Olh0C6YBcmvx5qLzE= Received: from localhost ( [2a02:560:4d3d:df00:625c:9e71:7750:882]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 14b7dba4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Mon, 13 Jan 2025 07:12:50 +0100 (CET) From: soeren@soeren-tempel.net To: guix-patches@gnu.org Subject: [PATCH v2] services: dns: Minor cleanup of unbound service. Date: Mon, 13 Jan 2025 07:12:43 +0100 Message-ID: X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2001:19f0:6c01:4ae:5400:ff:fe66:af9d; envelope-from=soeren@soeren-tempel.net; helo=magnesium.8pit.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: ludo@gnu.org 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: -0.1 (/) From: Sören Tempel In #68757, v3 instead of v4 of the patchset was committed by accident. This patch revives the (minor) changes made in the v4. * gnu/service/dns.scm: Remove exports of no longer existing names. (unbound-service-type): Fix at typo (unbound -> Unbound). (unbound-shepherd-service): Run after user processes. (unbound-account-service): Determine shell based on shadow package. --- gnu/services/dns.scm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index c74001fac29..dcfb90235c1 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -56,18 +56,14 @@ (define-module (gnu services dns) dnsmasq-configuration unbound-service-type - unbound-zone - unbound-server unbound-configuration unbound-configuration? - unbound-configuration-server - unbound-configuration-remote-control - unbound-configuration-forward-zone - unbound-configuration-stub-zone - unbound-configuration-auth-zone - unbound-configuration-view - unbound-configuration-python - unbound-configuration-dynlib)) + unbound-server + unbound-server? + unbound-zone + unbound-zone? + unbound-remote + unbound-remote?)) ;;; ;;; Knot DNS. @@ -1065,7 +1061,9 @@ (define (unbound-shepherd-service config) (list (shepherd-service (documentation "Unbound daemon.") (provision '(unbound dns)) - (requirement '(networking)) + ;; unbound may be bound to a particular IP address, hence + ;; only start it after the networking service has started. + (requirement '(user-processes networking)) (actions (list (shepherd-configuration-action config-file))) (start #~(make-forkexec-constructor (list (string-append #$unbound "/sbin/unbound") @@ -1080,11 +1078,11 @@ (define unbound-account-service (system? #t) (comment "Unbound daemon user") (home-directory "/var/empty") - (shell "/run/current-system/profile/sbin/nologin")))) + (shell (file-append shadow "/sbin/nologin"))))) (define unbound-service-type (service-type (name 'unbound) - (description "Run the unbound DNS resolver.") + (description "Run the Unbound DNS resolver.") (extensions (list (service-extension account-service-type (const unbound-account-service)) base-commit: 4fef7b26941940515533b4b463b505b28567afe6 ------------=_1737015002-2496-1--