From patchwork Sun Mar 23 10:27:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 40722 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 15D0327BBEB; Sun, 23 Mar 2025 10:29:35 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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=ham 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 AEBCE27BBE2 for ; Sun, 23 Mar 2025 10:29:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twIZm-0001uY-GZ; Sun, 23 Mar 2025 06:29:06 -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 1twIZk-0001u7-7x for guix-patches@gnu.org; Sun, 23 Mar 2025 06:29:04 -0400 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 1twIZj-0004ba-Us; Sun, 23 Mar 2025 06:29:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ttMAtEcCiYHJkMCR/IBKEWQcCL8EoJbxkaHl7zLghos=; b=mJdGaKhA8fhpJUK2YHZuROXwBPeAvnJ8STrFWNX9o+RuiLRxGkP8vZyJPfXSahHUPxSr9q8iK08VSJYnKLTWqW057cgaRP8PDiLfIMoYH7WzvCwxKxY5hYSZqxKBGsBUFOLJpC97lnVP9hUYfW2upimOdWFskj52Lg1L8oM8xzcqZUZxx2KIThphQQguPp7lvIqFJ33Dk5H80/NQqc16BXTjbzXfHL8KYh5rKRAKtRCRVlwctVlpyyuVnO/q5NKWRcLAyssZ0y8k2FJmws7c3dxsvhwWW/2jwkIvwmBpF2D4+gsMBKOXO9KuE6+cv1gE5kBZgmJoliYpfuojTt7tmQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1twIZj-0006La-NV; Sun, 23 Mar 2025 06:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77204] [PATCH 1/3] services: dnsmasq: Provide shepherd-provision and shepherd-requirement fields. Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 23 Mar 2025 10:29:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77204 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77204@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Maxim Cournoyer X-Debbugs-Original-Xcc: Ludovic =?utf-8?q?Court=C3=A8s?= , Maxim Cournoyer Received: via spool by 77204-submit@debbugs.gnu.org id=B77204.174272568824004 (code B ref 77204); Sun, 23 Mar 2025 10:29:03 +0000 Received: (at 77204) by debbugs.gnu.org; 23 Mar 2025 10:28:08 +0000 Received: from localhost ([127.0.0.1]:47813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1twIYn-0006Eb-2A for submit@debbugs.gnu.org; Sun, 23 Mar 2025 06:28:07 -0400 Received: from mail.mmer.org ([178.22.65.174]:57980) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1twIYk-0006Co-35 for 77204@debbugs.gnu.org; Sun, 23 Mar 2025 06:28:03 -0400 Received: from mail.mmer.org (localhost [127.0.0.1]) by mail.mmer.org (OpenSMTPD) with ESMTP id 0b255a0c for <77204@debbugs.gnu.org>; Sun, 23 Mar 2025 10:27:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=mmer.org; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=nZ492XzQdNs8jTvundVjer889 g/FWnLnE9bmrl0fEn8=; b=yGFFRBxj9zpU8WUlln4lmfFdNCGS2Zo7Xl7OGzOjG fmwxRraABI90qHrKOb9vX3U7U2B9JC9fFC+mmwwpuxgfhmoWmXX7lentIxx9nRgj dgI3j9weD7Qfj0b82o8IWJFKbHWYdk1iNI3S9J+PGQMzsTdWnDQHYtb0Ahn90Zu4 04= Received: from delta (16-254-250-62.ftth.glasoperator.nl [62.250.254.16]) by mail.mmer.org (OpenSMTPD) with ESMTPSA id c3efe54d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <77204@debbugs.gnu.org>; Sun, 23 Mar 2025 10:27:54 +0000 (UTC) Date: Sun, 23 Mar 2025 11:27:50 +0100 Message-ID: <242697cdc4ed0e257df4ba35500ae2a3b3a00a0b.1742725327.git.levenson@mmer.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 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: , Reply-to: Alexey Abramov X-ACL-Warn: , Alexey Abramov via Guix-patches X-Patchwork-Original-From: Alexey Abramov via Guix-patches via From: Alexey Abramov 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 * doc/guix.texi: Document the change. * gnu/services/dns.scm ()[provision]: Rename the field to [shepherd-provision] for consistency with other services. * gnu/services/dns.scm ()[shepherd-requirement]: New field. * gnu/services/dns.scm (dnsmasq-shepherd-service): Use newly-created fields. --- doc/guix.texi | 11 ++++++++--- gnu/services/dns.scm | 12 ++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index eecc0aec52c..fd6a0176348 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -35172,9 +35172,14 @@ DNS Services @item @code{package} (default: @var{dnsmasq}) Package object of the dnsmasq server. -@item @code{provision} (default: @code{'(dnsmasq)}) -A list of symbols for the Shepherd service corresponding to this dnsmasq -configuration. +@item @code{shepherd-provision} (default: @code{'(dnsmasq)}) +@itemx @code{shepherd-requirement} (default: @code{'(user-processes networking)}) +This option can be used to provide a list of Shepherd service names +(symbols) provided by this service. You might want to change the default +value if you intend to run several @command{dnsmasq} instances. + +Likewise, @code{shepherd-requirement} is a list of Shepherd service names +(symbols) that this service will depend on. @item @code{no-hosts?} (default: @code{#f}) When true, don't read the hostnames in /etc/hosts. diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index 05291eb65d9..9276504ffd0 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -742,8 +742,10 @@ (define-record-type* dnsmasq-configuration? (package dnsmasq-configuration-package (default dnsmasq)) ;file-like - (provision dnsmasq-provision - (default '(dnsmasq))) + (shepherd-provision dnsmasq-configuration-shepherd-provision + (default '(dnsmasq))) + (shepherd-requirement dnsmasq-configuration-shepherd-requirement + (default '(user-processes networking))) (no-hosts? dnsmasq-configuration-no-hosts? (default #f)) ;boolean (port dnsmasq-configuration-port @@ -802,6 +804,8 @@ (define-record-type* (define (dnsmasq-shepherd-service config) (match-record config (package + shepherd-provision + shepherd-requirement no-hosts? port local-service? listen-addresses resolv-file no-resolv? @@ -815,8 +819,8 @@ (define (dnsmasq-shepherd-service config) tftp-lowercase? tftp-port-range tftp-root tftp-unique-root extra-options) (shepherd-service - (provision (dnsmasq-provision config)) - (requirement '(user-processes networking)) + (provision shepherd-provision) + (requirement shepherd-requirement) (documentation "Run the dnsmasq DNS server.") (start #~(make-forkexec-constructor (list