From unknown Sun Aug 17 01:59:18 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75513] [PATCH] 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: Sun, 12 Jan 2025 10:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 75513 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75513@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.173667838511459 (code B ref -1); Sun, 12 Jan 2025 10:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jan 2025 10:39:45 +0000 Received: from localhost ([127.0.0.1]:46234 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tWvNg-0002yk-GO for submit@debbugs.gnu.org; Sun, 12 Jan 2025 05:39:44 -0500 Received: from lists.gnu.org ([2001:470:142::17]:35882) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tWvNd-0002yK-Td for submit@debbugs.gnu.org; Sun, 12 Jan 2025 05:39:42 -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 1tWvNV-0002N9-Ri for guix-patches@gnu.org; Sun, 12 Jan 2025 05:39:33 -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 1tWvNT-0007Ff-8N; Sun, 12 Jan 2025 05:39:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=1Fo9GU2d noM5uWEeuhgKs2Xk9ojvfBA31K077b9MFYc=; h=date:subject:cc:to:from; d=soeren-tempel.net; b=W3e9eUEsOxNkkWJpMPe2xUc2IBy7XefmTYMKGXW5guKomIi lzj8T3Yz7MhYHD/TsMfEW3Oopyl7qnzpabzR/yUQqvZNxivAF2KZ0pswTVDW1BvMfZq9Vy +mQO7enjgEE11oRk3sPz82Lq/PPbmumeGNGCEEWhemzglNnwEQOpl0= Received: from localhost ( [2a02:560:4d3d:df00:a0e3:3d9b:43c1:9542]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id ff178644 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sun, 12 Jan 2025 11:39:23 +0100 (CET) From: soeren@soeren-tempel.net Date: Sun, 12 Jan 2025 11:39:14 +0100 Message-ID: <43ab6f06ad9f41a32d1cd911f9efbbc29a9a5db0.1736678353.git.soeren@soeren-tempel.net> 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 typo/capitalization (unbound -> Unbound). (unbound-shepherd-service): Run after user processes. (unbound-account-service): Determine shell based on shadow package. --- gnu/services/dns.scm | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index c74001fac29..9fd3bebd496 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -56,18 +56,11 @@ (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-configuration + unbound-server + unbound-zone + unbound-remote)) ;;; ;;; Knot DNS. @@ -1065,7 +1058,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 +1075,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: 5d6c8767f67885bc9b2c8f18ab1f667d0065346b From unknown Sun Aug 17 01:59:18 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#75513: closed (Re: [PATCH] services: dns: Minor cleanup of unbound service.) Message-ID: References: <32VQWPRBV24UW.2DY88D257IMB8@8pit.net> <43ab6f06ad9f41a32d1cd911f9efbbc29a9a5db0.1736678353.git.soeren@soeren-tempel.net> X-Gnu-PR-Message: they-closed 75513 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 75513@debbugs.gnu.org Date: Mon, 13 Jan 2025 18:15:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1736792102-13075-1" This is a multi-part message in MIME format... ------------=_1736792102-13075-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #75513: [PATCH] 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 75513@debbugs.gnu.org. --=20 75513: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D75513 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1736792102-13075-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 75513-done) by debbugs.gnu.org; 13 Jan 2025 18:14:58 +0000 Received: from localhost ([127.0.0.1]:52803 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tXOxm-0003OR-Gc for submit@debbugs.gnu.org; Mon, 13 Jan 2025 13:14:58 -0500 Received: from magnesium.8pit.net ([45.76.88.171]:4462) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tXOxj-0003OE-T5 for 75513-done@debbugs.gnu.org; Mon, 13 Jan 2025 13:14:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=HL+FM/xs vtXnyiJ693B19msslPUFVSAtYRJtKx6pU0w=; h=from:subject:to:date; d=soeren-tempel.net; b=GBwzhlIKRn7eaaL2xRNNqU6MaSFlEY/VC6EQ8qFUk7W4BVP wMwbpxOkoSyzJ5Ow34FdRdq1u1u53WZCciYeLZTF+p0L0cFmI+pUhj9+gjDMpe488rhf+i HmjcGT1O/++r3GXrYcw3zgG5+VQv6/TVVeCV50rGFhbMbEDafW/3dQ= Received: from localhost ( [2a02:560:4d3d:df00:4fe7:d7be:f3b3:38d3]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id d23f170b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES) for <75513-done@debbugs.gnu.org>; Mon, 13 Jan 2025 19:14:53 +0100 (CET) Date: Mon, 13 Jan 2025 19:14:47 +0100 To: 75513-done@debbugs.gnu.org Subject: Re: [PATCH] services: dns: Minor cleanup of unbound service. From: =?UTF-8?Q?S=C3=B6ren?= Tempel Message-Id: <32VQWPRBV24UW.2DY88D257IMB8@8pit.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75513-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: -1.0 (-) Sorry, I messed up and accidentally send the v2 to patches@, hence this is superseded. See: https://issues.guix.gnu.org/75533 ------------=_1736792102-13075-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 12 Jan 2025 10:39:45 +0000 Received: from localhost ([127.0.0.1]:46234 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tWvNg-0002yk-GO for submit@debbugs.gnu.org; Sun, 12 Jan 2025 05:39:44 -0500 Received: from lists.gnu.org ([2001:470:142::17]:35882) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tWvNd-0002yK-Td for submit@debbugs.gnu.org; Sun, 12 Jan 2025 05:39:42 -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 1tWvNV-0002N9-Ri for guix-patches@gnu.org; Sun, 12 Jan 2025 05:39:33 -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 1tWvNT-0007Ff-8N; Sun, 12 Jan 2025 05:39:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=1Fo9GU2d noM5uWEeuhgKs2Xk9ojvfBA31K077b9MFYc=; h=date:subject:cc:to:from; d=soeren-tempel.net; b=W3e9eUEsOxNkkWJpMPe2xUc2IBy7XefmTYMKGXW5guKomIi lzj8T3Yz7MhYHD/TsMfEW3Oopyl7qnzpabzR/yUQqvZNxivAF2KZ0pswTVDW1BvMfZq9Vy +mQO7enjgEE11oRk3sPz82Lq/PPbmumeGNGCEEWhemzglNnwEQOpl0= Received: from localhost ( [2a02:560:4d3d:df00:a0e3:3d9b:43c1:9542]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id ff178644 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sun, 12 Jan 2025 11:39:23 +0100 (CET) From: soeren@soeren-tempel.net To: guix-patches@gnu.org Subject: [PATCH] services: dns: Minor cleanup of unbound service. Date: Sun, 12 Jan 2025 11:39:14 +0100 Message-ID: <43ab6f06ad9f41a32d1cd911f9efbbc29a9a5db0.1736678353.git.soeren@soeren-tempel.net> 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 typo/capitalization (unbound -> Unbound). (unbound-shepherd-service): Run after user processes. (unbound-account-service): Determine shell based on shadow package. --- gnu/services/dns.scm | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index c74001fac29..9fd3bebd496 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -56,18 +56,11 @@ (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-configuration + unbound-server + unbound-zone + unbound-remote)) ;;; ;;; Knot DNS. @@ -1065,7 +1058,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 +1075,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: 5d6c8767f67885bc9b2c8f18ab1f667d0065346b ------------=_1736792102-13075-1--