From patchwork Mon Jan 13 06:12:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Tempel?= X-Patchwork-Id: 37006 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 0D23F27BBE9; Mon, 13 Jan 2025 06:14:45 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C771F27BBE2 for ; Mon, 13 Jan 2025 06:14:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tXDiA-0003ex-35; Mon, 13 Jan 2025 01:14:06 -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 1tXDi8-0003eg-Bt for guix-patches@gnu.org; Mon, 13 Jan 2025 01:14:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tXDi7-000865-EG for guix-patches@gnu.org; Mon, 13 Jan 2025 01:14:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=O0tIiFkbS6OljkMq8Z9f+zuU9X4dQOGoGLVqwTS3Nc4=; b=NITXZ4D3CMwonNmpfAIwwzCIC9mIb5wYu1lzUD+2yXypD1p9/EJFa/oDkaV2asWQguoqpWcL6PRJZ5g1g9AzKUO98krVA/f6F22zT4kmTGlLAcYyHq5q2eafk+rt+FYo8c4pEHRV+5YpATmvYzqLqYIKlp7sUSrP7HMeSTikS2SJybfxrva3BXDCCFXXggK3VNz8hM94uzaoKB9Y14CO+R0NOn4VvS7IWZW/nev2GcIGAsdG8j+zrC6IY9c/Abg56iX/qQYE1HOy71qSO+MROyR9Jx5PhepvJmXJnF3I6Bit2/IfflC/LTdb8e6bG98FaAy1QY2hXsFZ9DrJt4/AUg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tXDi6-0000p7-AE for guix-patches@gnu.org; Mon, 13 Jan 2025 01:14:02 -0500 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 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-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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(-) base-commit: 4fef7b26941940515533b4b463b505b28567afe6 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))