From patchwork Fri Dec 27 13:29:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 45mg <45mg.writes@gmail.com> X-Patchwork-Id: 35860 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 C11F127BBEB; Fri, 27 Dec 2024 13:31:38 +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.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,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 E200727BBE9 for ; Fri, 27 Dec 2024 13:31:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRAQv-0003we-Np; Fri, 27 Dec 2024 08:31:17 -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 1tRAQh-0003ty-Gr for guix-patches@gnu.org; Fri, 27 Dec 2024 08:31:03 -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 1tRAQg-00007a-GS; Fri, 27 Dec 2024 08:31:02 -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=2dN3y6DoWAIsbqQZ4XkvepTrNVycdC3iPOLBOgxgnOs=; b=CodIlNF3VLSS9xeXnhlezRpNOikzE9daZ2VUsAUgojhj9NdIeNVnvDHKdiS1Ah8wLHhWdjmGUyodFnCNZXIjzsXQBn8AeaRGH4WiOCGp+8wxgK5o24bhAp8N8HMZq4q4AOw0ZC1d28KK/VMebgCcP/CDZZF3ZdM9h5sZLAp3XPh/WLfiCvPdQ0G3hmUiUeeZrXs7Sn/9KOOQtRjRHNF13GxqgNpzUGyJeAG3s76I6Su/wb+v4RsEXsut3C99ain/b/qSMsbiZzx8RRYxVCgBO0MUDgjbGVc6Z/n7QrDzoZyW4PpxTlsVHkh24S5RTToK+tLZttH/w14A4xK/quV4gQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tRAQg-0000tI-2H; Fri, 27 Dec 2024 08:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75140] [PATCH] services: dnsmasq: Allow custom Shepherd provision Resent-From: 45mg <45mg.writes@gmail.com> Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 27 Dec 2024 13:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 75140 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75140@debbugs.gnu.org Cc: 45mg <45mg.writes@gmail.com>, Ludovic =?utf-8?q?Court=C3=A8s?= , Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Ludovic =?utf-8?q?Court=C3=A8s?= , Maxim Cournoyer Received: via spool by submit@debbugs.gnu.org id=B.17353062533405 (code B ref -1); Fri, 27 Dec 2024 13:31:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Dec 2024 13:30:53 +0000 Received: from localhost ([127.0.0.1]:45083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRAQW-0000sq-Qt for submit@debbugs.gnu.org; Fri, 27 Dec 2024 08:30:53 -0500 Received: from lists.gnu.org ([209.51.188.17]:43074) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <45mg.writes@gmail.com>) id 1tRAQV-0000sh-G0 for submit@debbugs.gnu.org; Fri, 27 Dec 2024 08:30:52 -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 <45mg.writes@gmail.com>) id 1tRAQL-0003qR-ES for guix-patches@gnu.org; Fri, 27 Dec 2024 08:30:43 -0500 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <45mg.writes@gmail.com>) id 1tRAQJ-0008PA-Ed for guix-patches@gnu.org; Fri, 27 Dec 2024 08:30:41 -0500 Received: by mail-pl1-x643.google.com with SMTP id d9443c01a7336-2161eb95317so90906425ad.1 for ; Fri, 27 Dec 2024 05:30:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735306235; x=1735911035; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2dN3y6DoWAIsbqQZ4XkvepTrNVycdC3iPOLBOgxgnOs=; b=Jrggr+OhGPw8ceRXz3rX4WsgP+ofClFTs7v67UIv5fDDujLH4kE7AtaJJWEnv51UF1 CRPQZrCccH9WAMI0VquV3KI3GUx/tg6NUKnX5/keKjZdc1/pDYy5n2CZJ22RWm8x4/nH cuUuwNurtsYMRX3cniHnRA49VpNgFDZQtuPe+PjlR3J6wFx8cDRzmKk/70qPlIKl8sKg mBpdhml5+AH3LBIrNOn4UtYufyZScRy+HSMGi73lVKltrNr8W3Me3vFOvAhe+F4YO36k gDC9wrSu5aZDEpgzs4a2Eu0czfrWEb6qFCwF6nfXCU4MD0tsS6pA8v8ZgHmDG8KDXuU5 hWfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735306235; x=1735911035; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2dN3y6DoWAIsbqQZ4XkvepTrNVycdC3iPOLBOgxgnOs=; b=Gx69Y9QWprbMDSlXjJcOG80WtM+/4DZMpVKV3lvFsnGMLCrODZBR0mm02g2/TYo9nZ V6pQ87F9WmUc4oJ/PVNn0e1rrZiEYo2o4xXZsn9xF0qfBjJSMWaXW6mwa/WwY7W4ARMW 5i5/ylj+M7uL2TGBmnhL9wBCkcKGfHs13DivbEnbL1L5EAvSAb/uxxaHQOOne03aI6Dd 3B0Ck5bHqOhpLdkspsLEULggzb6RNJ2glkJkPTSZX2GgX4HEEyTO/g/Bawo0YwbDfBEx AZlelRJQfiMd+2/WUJQX2iuG2my9typJ6BDZz0oUAZHCLuPHdXGbnMVwJBaw9FnMfdnk OElg== X-Gm-Message-State: AOJu0Yy1Grlhq47qxHzMAjRhl06mWdOOiY3LFhe28YvK2aJ3d4EiwNH/ SWKo3/C1GuDPZdMdeuRam7ifo1UccNC9qMcS0J4cBcvFtM5xYmxJXFgVcqmW X-Gm-Gg: ASbGnctSK8StB4GDom7XLXjzSFs92vdio9UJUB8kYiGdKRGrcn5KV4AxHNSnbCYIQps nne7iUrLFCF3LkbDtExRsSZ5roKxp1ISTnuhK5J1ls40W54Qy6s246uil2juQRE8/PrQblOS7et A5/m++lW+uvfE+mv5lK7eOepzaecm8cHZ+0o0Owvj7AzTeGf4LCHlUwTpY5qinEau9TpJiBkJa4 Z6xy/+6dDuQwtnJ/wwOXZsZo7MoXF5gSoAsTNAGragoM1oN1/PQNSt1+B3BT6/vI5A1JUpOYJ2x X-Google-Smtp-Source: AGHT+IGwlFNzMyZRIsyu5JP9p/mLViiKdXl35nwsdAa064sOmkbopLg5mWcp4lNsIp6pk0YXUL7tnQ== X-Received: by 2002:a17:902:dad2:b0:216:431b:e577 with SMTP id d9443c01a7336-219e6f28193mr319816265ad.51.1735306235033; Fri, 27 Dec 2024 05:30:35 -0800 (PST) Received: from localhost.localdomain ([2401:4900:1cb8:a2d3:f4aa:1246:d469:678a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9d4464sm135818175ad.159.2024.12.27.05.30.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 05:30:34 -0800 (PST) From: 45mg <45mg.writes@gmail.com> Date: Fri, 27 Dec 2024 08:29:52 -0500 Message-ID: X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::643; envelope-from=45mg.writes@gmail.com; helo=mail-pl1-x643.google.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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 Allow users to have multiple dnsmasq instances by specifying different `provision` values for the corresponding Shepherd services, similar to what is done with `static-networking-service-type`. * gnu/services/dns.scm ()[provision]: new option. (dnsmasq-shepherd-service): Use supplied provision value. * doc/guix.texi (DNS Services)[dnsmasq-configuration]: Document it. Change-Id: I78c7f015cb1db239a600bc5373b2fd80e8b9b9f4 Reviewed-by: Maxim Cournoyer --- doc/guix.texi | 4 ++++ gnu/services/dns.scm | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) base-commit: 831b94a1efcea8f793afc949b5123a6235c9bb1a diff --git a/doc/guix.texi b/doc/guix.texi index da4d2f5ebc..e9547ea8f2 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -34129,6 +34129,10 @@ 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{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 043c34599c..532e20e38a 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -731,6 +731,8 @@ (define-record-type* dnsmasq-configuration? (package dnsmasq-configuration-package (default dnsmasq)) ;file-like + (provision dnsmasq-provision + (default '(dnsmasq))) (no-hosts? dnsmasq-configuration-no-hosts? (default #f)) ;boolean (port dnsmasq-configuration-port @@ -802,7 +804,7 @@ (define (dnsmasq-shepherd-service config) tftp-lowercase? tftp-port-range tftp-root tftp-unique-root extra-options) (shepherd-service - (provision '(dnsmasq)) + (provision (dnsmasq-provision config)) (requirement '(networking)) (documentation "Run the dnsmasq DNS server.") (start #~(make-forkexec-constructor