From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id sHRkOrLdCmQYqwAASxT56A (envelope-from ) for ; Fri, 10 Mar 2023 08:35:15 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 8JAmOrLdCmRZ4wAAauVa8A (envelope-from ) for ; Fri, 10 Mar 2023 08:35:14 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1241A66F0 for ; Fri, 10 Mar 2023 08:35:13 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paXHQ-0006OH-S8; Fri, 10 Mar 2023 02:35:08 -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 1paXHL-0006NJ-Ck for guix-patches@gnu.org; Fri, 10 Mar 2023 02:35:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1paXHK-0007Fz-Fu for guix-patches@gnu.org; Fri, 10 Mar 2023 02:35:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1paXHK-000654-7d for guix-patches@gnu.org; Fri, 10 Mar 2023 02:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61956] [PATCH v2] services: dns: Extend dnsmasq-configuration. Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 10 Mar 2023 07:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61956 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Sergey Trofimov , 61956@debbugs.gnu.org Cc: Sergey Trofimov Received: via spool by 61956-submit@debbugs.gnu.org id=B61956.167843368223344 (code B ref 61956); Fri, 10 Mar 2023 07:35:02 +0000 Received: (at 61956) by debbugs.gnu.org; 10 Mar 2023 07:34:42 +0000 Received: from localhost ([127.0.0.1]:53572 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paXGz-00064R-Qq for submit@debbugs.gnu.org; Fri, 10 Mar 2023 02:34:42 -0500 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:56895) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paXGx-00064D-R9 for 61956@debbugs.gnu.org; Fri, 10 Mar 2023 02:34:41 -0500 Received: (Authenticated sender: andrew@trop.in) by mail.gandi.net (Postfix) with ESMTPSA id 5A609C0009; Fri, 10 Mar 2023 07:34:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1678433673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=enKXeGPBAjYgXU+u5a+4txNrNuT8WzEZRE+ttOsWT6k=; b=ptbLoYWiyz4JvtwZPPQIWZ4z0dOWRa9LoWe8iDmzg7okcpBzgTVAfy3iu3lC0LswrCQ+xL 33vDnJAvk1SV/HJcEBeu89R4X9glPEQW0nLZ8h6N4+79lMoLVPo4saeJK48H3jwQlDA1/T OuJynwaYLqU9FixoQ5mAuPDzxAVhixgc9l20JpP3Q0fgV3bY/VbC1gUmrdRAMNB/Iadrd9 DhWOEyzfdXG16/rZyY2nWqByvWKE2rGnKPtecSifTgTbeS3W/AdFyKCCVNT30P18dk5SSR cm6wyp4RJcdq6sgmcmKnAm8iHcAhkW4NsT+aQ6sh0Mk4y7+LyQNqDwHt7vIQlw== From: Andrew Tropin In-Reply-To: <20230304084030.32117-1-sarg@sarg.org.ru> References: <20230304082719.29479-1-sarg@sarg.org.ru> <20230304084030.32117-1-sarg@sarg.org.ru> Date: Fri, 10 Mar 2023 11:34:26 +0400 Message-ID: <87ilf9cb5p.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1678433714; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=enKXeGPBAjYgXU+u5a+4txNrNuT8WzEZRE+ttOsWT6k=; b=Ulxj4nP0U0qvKg8RcwdmGNImy95loQFpWdoRZAbrnIKXLt1y321n5zZkHeOVR6p95sAICj xCL6J308xaohk14huzwNm5Y1DrIocYPyAhcjI8uszjJ/Hbn9NVGqOjT2DCmbIoiigjuJjU U9Or7mCbtYBrIWgdeuqZx7H+vuWjuYM4K46DGW0wCtpmCktaJW0C1sPr7NpOiKciusSuug /1vR0Kyi/HQyYKyG4mk+14zm7wneFOl/17C79h7uu/ydQlowYweYukpd7tRHO9uS1HbJPz Yi7txNJH/2yUC6XYGANCTNF2DTcLGVHkJ6sNnc2JtXEFk3T2UWrnnmQsV6YFPA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=gm1 header.b=ptbLoYWi; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1678433714; a=rsa-sha256; cv=none; b=IKIqVQKCOhs0r4xCa/uXYTuNi01x4wHeODrGSU3N7u5CrPuqDmH7YZesmHzBA4w38x5jl8 29CtCTLx6uFYqFc+cVAiIwnge5n+wR13tscv7M3l/Rge6jP1EHlEpxMgL1jLEn1ScPZHDj HPrdFEU1WSNP51NFmE7goCV6eUkgAjnWRKo7i8NyIg9nIypZBquBetfNf8yDYcUegxcZwj EnVvBSQakCOnQIfN0TnqkDDkYrNcJk0p6e8dEMN+45X+d3CGLUlbxcfRssmL+2T6d+Vpho 56vbJsR2hfiHozuV7eaYM1EXajZtfsIOGJfaVJrhakig7HgIxS5oqVyrRegIBg== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=gm1 header.b=ptbLoYWi; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none X-Migadu-Spam-Score: -0.89 X-Spam-Score: -0.89 X-Migadu-Queue-Id: 1241A66F0 X-Migadu-Scanner: scn1.migadu.com X-TUID: 67aQTfhebaWc --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2023-03-04 09:40, Sergey Trofimov wrote: Hi Sergey! Thank you for the patch, please add information to the commit message body. Here is an example: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=3D8390b47c04 > --- > doc/guix.texi | 3 +++ > gnu/services/dns.scm | 9 +++++++-- > 2 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/doc/guix.texi b/doc/guix.texi > index 74658dbc86..ca66041d12 100644 > --- a/doc/guix.texi > +++ b/doc/guix.texi > @@ -31502,6 +31502,9 @@ in @var{servers}. > @item @code{servers} (default: @code{'()}) > Specify IP address of upstream servers directly. >=20=20 > +@item @code{servers-file} (default: @code{#f}) > +Specify file containing upstream servers. This file is re-read when dnsm= asq receives SIGHUP. > + > @item @code{addresses} (default: @code{'()}) > For each entry, specify an IP address to return for any host in the > given domains. Queries in the domains are never forwarded and always > diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm > index 50753b7ab6..3a6a005fb7 100644 > --- a/gnu/services/dns.scm > +++ b/gnu/services/dns.scm > @@ -754,6 +754,8 @@ (define-record-type* > (default #f)) ;boolean > (servers dnsmasq-configuration-servers > (default '())) ;list of string > + (servers-file dnsmasq-configuration-servers-file > + (default #f)) ;string I would expect it to be a file-like rather than string, so we are sure that the configuration file is present. WDYT? > (addresses dnsmasq-configuration-addresses > (default '())) ;list of string > (cache-size dnsmasq-configuration-cache-size > @@ -792,7 +794,7 @@ (define (dnsmasq-shepherd-service config) > port local-service? listen-addresses > resolv-file no-resolv? > forward-private-reverse-lookup? query-servers-in-order? > - servers addresses > + servers addresses servers-file > cache-size negative-cache? > cpe-id > tftp-enable? tftp-no-fail? > @@ -827,6 +829,9 @@ (define (dnsmasq-shepherd-service config) > #$@(if query-servers-in-order? > '("--strict-order") > '()) > + #$@(if servers-file > + (list (format #f "--servers-file=3D~a" servers-f= ile)) > + '()) > #$@(map (cut format #f "--server=3D~a" <>) > servers) > #$@(map (cut format #f "--address=3D~a" <>) > @@ -848,7 +853,7 @@ (define (dnsmasq-shepherd-service config) > '("--tftp-single-port") > '()) > #$@(if tftp-secure? > - '("--tftp-secure?") > + '("--tftp-secure") > '()) > #$@(if tftp-max > (list (format #f "--tftp-max=3D~a" tftp-max)) =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmQK3YIACgkQIgjSCVjB 3rC1MA//UsnTdFiLJbFAyCFkdahq3m3f4HMU48Icd0n8IAJYA4s5LJuSHOUbebqQ MV9o5btLpWNVS8BfRCpy/8L7vLNSZXyLI7gbeoTBCzgKzTqq00kgbGL5Dn5h0s4O G44nKYZZyC7ufVovKxPN5HKlqJvmNN61DZAQREhILJII+bQ8YUySsWA0n8swqs1V xfJIj/TjK5fXlYYVttEV12hC5W/3h0vfylbib1DtjHtJ2BPIMDstRu0eFsoYQgXQ KKneH2cKTbd/ecF3gsQoqltmsTP24wdJ+0h3h05cpjzCfijiFU+WaUH1Mc+ZwqrY PSdZae9vS9FP0Y4BM3Jf4SK5rQZ/SM/KSiu+BvOfLhiNoJ3R4eJIakyAh+lc4F7T kyhwePtvgVD8cf9Cek3qd4CdDnX3733Sz6Dsupwp7YdMfUk+++QL3Rq0gpzLu3Ma D70F1kq/2jCR8P/ZaSxkAx11f93pxlmf3pWrEzvWOpIFbWyIN1rwf3P+hXeD0iCn lE/9xWUGgkFRwW7KhSByP0OYheOdsBi+6k0nyvfVApYly71q/0GDCHQ5Tgqm888r 9SzYp2YXwyCKBCVgihzGJ/Mp/EjfSCfihi1Z6WhrkaaG0uhtwACl2qScW4YSxHbn SGyVUZaVYKs1hnI3g4jhgHUoTOizNs0IRtW7vBj1277E2GV5naE= =czgq -----END PGP SIGNATURE----- --=-=-=--