From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 27 08:30:53 2024 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> To: guix-patches@gnu.org Subject: [PATCH] services: dnsmasq: Allow custom Shepherd provision Date: Fri, 27 Dec 2024 08:29:52 -0500 Message-ID: X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 X-Debbugs-Cc: Ludovic Courtès , Maxim Cournoyer Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: 45mg <45mg.writes@gmail.com> 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: -2.3 (--) 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 --- doc/guix.texi | 4 ++++ gnu/services/dns.scm | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 base-commit: 831b94a1efcea8f793afc949b5123a6235c9bb1a -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 28 00:36:26 2024 Received: (at 75140) by debbugs.gnu.org; 28 Dec 2024 05:36:26 +0000 Received: from localhost ([127.0.0.1]:48388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRPUv-0007tb-ON for submit@debbugs.gnu.org; Sat, 28 Dec 2024 00:36:25 -0500 Received: from mail-pl1-f169.google.com ([209.85.214.169]:51581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRPUt-0007tM-B5 for 75140@debbugs.gnu.org; Sat, 28 Dec 2024 00:36:23 -0500 Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-216401de828so92430185ad.3 for <75140@debbugs.gnu.org>; Fri, 27 Dec 2024 21:36:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735364118; x=1735968918; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=PwTNaU+nithJe/Z5Ff63VQxwXv8rtt3AmNlanIac3dw=; b=DqS4fCGp3OtMNvsjEhBanDtN75pw2uI7rIgpv9G0e/n9wf7hEXD1Gmi+DWA00l5x7Q 7qNSMSYC4HF0On3FByNKvVAeUfpmhOzqDlTYJSpxyUMRISHS+TAizNmaKxGkxVq8m8Bm tcCmXUuCUCbaXTFoFjOi++Ei9iKky8yjs7JxqfY2HLWrwVRvrdtL0EpXJpAnHM4lGU6I vzM+KwgR/Pn/fmi0B0Jmbdh27eco3l/I9R1WHJzUy+JueaQJuTpczhRZcEnfY573Cubf SvTYkKBwOf+eAwt/Qntol+/cRDb2wz85wzlG51NZF4u6CmNJVF7RP/dFVP7LCWRSpUGI YInw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735364118; x=1735968918; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=PwTNaU+nithJe/Z5Ff63VQxwXv8rtt3AmNlanIac3dw=; b=XE/K6B6IcRseN9wcN0D3orVntn8YWK5C2ufzb59wyBBRp+58vIZkoRzcQdPt1/Zi7N qEFCiH57rowMBF4Ib8FoBKhlEgwYnzGa26ZoUMpmk90K1O62jUTef3JtlymBq45k0Erc 2jQe4lGCija+YRU5J//Ara3lpVHPr8GO9ds9NQ1OxkSdTThztNJGxX+ogtEI05KGV6tf GzGwnYWs/IOdARV1ghYstqrq8Fr5WPJmK8/RffclwingPZZIeFh89yAO1HrYWQBy55H7 AM9U4ZLjb1UGRJ2bAJfXYTML2qArUmkdZbJtQuJTL3Q7TVzZSrugLRXdtZk/47aBqz8t XmYw== X-Gm-Message-State: AOJu0Yx5g2zu+Op8ZE1O36zpKXxYnJikYWEOIFfX4yfbSpHRd1HCwYk+ 8chk3P74yoEIwC+zl1aY5SWw0m5XHd2wMDmnW4CeaHh6aY4iWp+C X-Gm-Gg: ASbGncsxCJ7d2NavZQOgnM73W5j6oEq8qm8Q82kfD+rZ/HjSDcm93b1XAa1d8HJTW/7 AvxvPHtrQd9aYosrwU/eY6Sf95AiqemwjGOHViuy8+nIu1b5l34UlRId13COlp8kD9CryfcLWrt pLcTL7KaQ9+IXhkQIfwv4dv4no2aVPltfVD2TfbrvBpn4ZxZRsubgnrkiXHOF3/uqQMayPZnMU2 pQqDx7TNPqCKmmAMvbOXNxxU8V+nq4+gbchW/fpQbLQPJU0g8ttIQ== X-Google-Smtp-Source: AGHT+IGQU779zxZ9zY19rAEk+DhUxKXaQ2wg1uVvLClCkuqoAqTPF6hkdfgFEfgq7Z83CqbI1fhjEg== X-Received: by 2002:a05:6a00:ac3:b0:726:f7c9:7b1e with SMTP id d2e1a72fcca58-72abddcadd6mr38329298b3a.13.1735364117721; Fri, 27 Dec 2024 21:35:17 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72aad8fb83asm15416707b3a.138.2024.12.27.21.35.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2024 21:35:17 -0800 (PST) From: Maxim Cournoyer To: 45mg <45mg.writes@gmail.com> Subject: Re: [bug#75140] [PATCH] services: dnsmasq: Allow custom Shepherd provision In-Reply-To: (45mg.writes@gmail.com's message of "Fri, 27 Dec 2024 08:29:52 -0500") References: Date: Sat, 28 Dec 2024 14:35:07 +0900 Message-ID: <87jzbktlo4.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 2.7 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 45mg writes: > 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`. [...] Content analysis details: (2.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.214.169 listed in sa-accredit.habeas.com] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.214.169 listed in bl.score.senderscore.com] 2.7 RCVD_IN_PSBL RBL: Received via a relay in PSBL [209.85.214.169 listed in psbl.surriel.com] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.214.169 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (maxim.cournoyer[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.214.169 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 75140 Cc: 75140@debbugs.gnu.org, Ludovic =?utf-8?Q?Court=C3=A8s?= 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.7 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 45mg writes: > 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`. [...] Content analysis details: (1.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.214.169 listed in sa-accredit.habeas.com] 2.7 RCVD_IN_PSBL RBL: Received via a relay in PSBL [209.85.214.169 listed in psbl.surriel.com] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.214.169 listed in list.dnswl.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.214.169 listed in bl.score.senderscore.com] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.214.169 listed in wl.mailspike.net] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (maxim.cournoyer[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager 45mg <45mg.writes@gmail.com> writes: > 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 -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 04 17:38:37 2025 Received: (at control) by debbugs.gnu.org; 4 Jan 2025 22:38:37 +0000 Received: from localhost ([127.0.0.1]:57854 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tUCmy-0000hJ-Vg for submit@debbugs.gnu.org; Sat, 04 Jan 2025 17:38:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35218) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tUCmx-0000h2-CU for control@debbugs.gnu.org; Sat, 04 Jan 2025 17:38:35 -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 1tUCmr-0004CY-OG for control@debbugs.gnu.org; Sat, 04 Jan 2025 17:38:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:Subject:From:To:Date:in-reply-to: references; bh=gHqVox5ecsYBuLhXl62Vho08PymvA+v+bLAAITcAuqY=; b=Jo3m83cPNMuD/7 5TXeBQ7Bn7zE7ECxYHR+5n7uV7P9CItNgd1hsqF/GDxxjIuTeEhxlrJxRDUD15h3ZH7hcGLUbArys BmxeslMsjVugw9onACMlgzp75RVJl34j2JUR9Yrr7xRIAokTCmx9kfpIEHdFGNY91iRIEMXD3U9nC OOqLMH/ODvqM3b89OnMF8ESdR2CmkZb4bSheXU8259kEtRaFdwSAByEPyEtuKACci1hS7KHQtuKZz gVnFHABRWCkQfSxzF+pEMysU0wOD71ExPiH7Ea3xcTz+hjJDLytxhun3OzYTCsPwPCA2EDd5vs/j+ ZOrVyUjdSBcUb4gurUpg==; Date: Sat, 04 Jan 2025 23:38:27 +0100 Message-Id: <87ldvqnr18.fsf@gnu.org> To: control@debbugs.gnu.org From: =?utf-8?Q?Ludovic_Court=C3=A8s?= Subject: control message for bug #75140 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control 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 (---) close 75140 quit From unknown Fri Aug 15 16:23:32 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 02 Feb 2025 12:24:12 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator