From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id AFz2DLAiD2S8oAAASxT56A (envelope-from ) for ; Mon, 13 Mar 2023 14:18:40 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 6BLuDLAiD2QqJgEA9RJhRA (envelope-from ) for ; Mon, 13 Mar 2023 14:18:40 +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 C23D829787 for ; Mon, 13 Mar 2023 14:18:39 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbi4D-0007Ux-AD; Mon, 13 Mar 2023 09:18:26 -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 1pbi3v-0007UH-0A for guix-patches@gnu.org; Mon, 13 Mar 2023 09:18:07 -0400 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 1pbi3u-00058X-O3 for guix-patches@gnu.org; Mon, 13 Mar 2023 09:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pbi3u-0004F8-GW for guix-patches@gnu.org; Mon, 13 Mar 2023 09:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#61956] [PATCH v5] services: dns: Extend dnsmasq-configuration. Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Mar 2023 13:18: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.167871347216294 (code B ref 61956); Mon, 13 Mar 2023 13:18:02 +0000 Received: (at 61956) by debbugs.gnu.org; 13 Mar 2023 13:17:52 +0000 Received: from localhost ([127.0.0.1]:33890 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbi3j-0004Ej-L6 for submit@debbugs.gnu.org; Mon, 13 Mar 2023 09:17:51 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:37189) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbi3g-0004ER-J1 for 61956@debbugs.gnu.org; Mon, 13 Mar 2023 09:17:49 -0400 Received: (Authenticated sender: andrew@trop.in) by mail.gandi.net (Postfix) with ESMTPSA id 783651C0009; Mon, 13 Mar 2023 13:17:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1678713462; 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=/PW8ZoZKoxNkHhmHk9/xfOunthGXIXRE53W6Z7ifGKM=; b=hD3FNzma9EaCnNwSOkyrMK3zqyeeE1yOeBQOsFOUMJoVbGDulHXUqVgJYL9cBUtuBknfJc CqAzs3qvbh7BAg7s4/JLtSz/QmOwlpWeK8GYcBt53eNO0U4tRobxnJPQ+4xmm3uSLcDxwy aMtDDkEJ3nZl6oPP63oVK39u/OKf1aQiJsW25Cp8g8Pca6cTIikD2fVw82G57V2vEBJK6S Q7LiXGLSXb7j5gjwxsQW0/c/hM9egP32ZuApiPZydQPTbqpP7cREScRb1vhNGr0m36Siwx 1YUWuhId/RnAYdEO3B32kgt3SnegZcivHZwdrwgX4w1jlDYJ0nqrA+yNKI3rZg== From: Andrew Tropin In-Reply-To: <20230310150055.3728-1-sarg@sarg.org.ru> References: <20230304082719.29479-1-sarg@sarg.org.ru> <20230310150055.3728-1-sarg@sarg.org.ru> Date: Mon, 13 Mar 2023 17:17:35 +0400 Message-ID: <871qlsbxjk.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-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=gm1 header.b=hD3FNzma; 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=1678713520; a=rsa-sha256; cv=none; b=ZuAfe8NlaFhVgAqda1yUtz6jHpxPH6FjWLrBzD0ZdJM1Xq5ijFU1NJ3n4aUVdvSn0DclBh DatKeFvS1SUdZSeG9OdLXTm5RX96NQeMZnN53Bd+iLl1e9kCrqFbVn1rvDzxxc45e31wTz 9yCGhOot0FnEZb/G0CuANOxH0KLkXlOxXK3EtIxd3Gv3BJoMFGnHMvms1Kouhy6Dk3Nbjn oaUmKEGDCsqZQ5cmMg4yvdyu5963kIgD3dsus3hdb5Z6JWqP+k1CC6uvyYWOclQOt5uheC sWErMTugEC3zdq/PRHCNsymnECzVTZH4VjtSb6SnWrGM7tuTpMRN03dnt8pBLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1678713520; 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=/PW8ZoZKoxNkHhmHk9/xfOunthGXIXRE53W6Z7ifGKM=; b=OVjZ3s4dZCPP788cFVnlty1NbrQs+smXP0n8AT0tzVkyReisTNYIV5nPCmPkSVl7/sR2bx 5bHM959g11p7/EIpiUJfT3WtUTzexN26OLRrpH0rM8XTyzJ6NFApQNBjdDLz2nti6FL1Dp AmLytAmCvAl1H6epkHHRdYnpdZiGALY7HpxKzyQWPR3bnwvLja+NY0ixE9BI1AIDEufUzw jBDQs/Ve35VtRBjqTazqqHMF62bORKWBhnZlWdaFs370CYtpDt9J6z1XwQ/T3gx1wUpHAz tYfwvDESE8OstowEgqhBI/TE0LBH77VMKLAXs2SeZgRcg7EvdXlJ1qVrxtOzfA== X-Migadu-Spam-Score: -3.91 X-Spam-Score: -3.91 X-Migadu-Queue-Id: C23D829787 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=gm1 header.b=hD3FNzma; 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-TUID: U8Fp2cIJZMie --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2023-03-10 16:00, Sergey Trofimov wrote: > * gnu/service/dns.scm: ()[servers-file]: Add. > ()[tftp-secure?]: Fix typo in parameter name. > * doc/guix.texi: Document ()[servers-file]. > --- > doc/guix.texi | 4 ++++ > gnu/services/dns.scm | 11 ++++++++--- > 2 files changed, 12 insertions(+), 3 deletions(-) > > diff --git a/doc/guix.texi b/doc/guix.texi > index 6671ba9305..debff95466 100644 > --- a/doc/guix.texi > +++ b/doc/guix.texi > @@ -31502,6 +31502,10 @@ 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. > +Could be either a string or a file-like object. > + > @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 32fb8c0664..aaa2b6e47f 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|file-like > (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? > @@ -805,7 +807,7 @@ (define (dnsmasq-shepherd-service config) > (requirement '(networking)) > (documentation "Run the dnsmasq DNS server.") > (start #~(make-forkexec-constructor > - '(#$(file-append package "/sbin/dnsmasq") > + (list #$(file-append package "/sbin/dnsmasq") > "--keep-in-foreground" > "--pid-file=3D/run/dnsmasq.pid" > #$@(if no-hosts? > @@ -827,6 +829,9 @@ (define (dnsmasq-shepherd-service config) > #$@(if query-servers-in-order? > '("--strict-order") > '()) > + #$@(if servers-file > + (list #~(string-append "--servers-file=3D" #$serv= ers-file)) > + '()) > #$@(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)) Hi Sergey! Thank you for the patch, applied, realigned make-forkexec-constructor arguments, pushed as d1edb26388ca4dab4b435a686cd059d97c113c3e. =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmQPIm8ACgkQIgjSCVjB 3rAqMg/+Na/LQ8zuvs4T2J8cDRSurMxa60RbAspbERXE90k4L3+W7TEL/+0BwSdx FhsghX+Z7cohSFnWd+vUO3aww7m8rnu9h+d2rGlOj18cMxUAO6PFLZeYss8SVIk8 eaxTjPxidjKwCtwTd7+6ZOLGkf2E14wK5DeaTBzyu2H7t1/+EflFTEqaW2A39F+Y 6P/FPGMJpWsJlwu2VcvfQ3tEfKFOglQNHwZDQ9AHABCe/OOX9Q7e/PQvQ8vkVzrS ZyTAerzlAGxE47RNNouZs9hh98o45OFKZux8FgODsseLH5FxKVXWw3lVLuvY5odD wPxrt1HViKiCB/jsFrRv8Sy3wRJ5aEyrL/NR0VJco7YcnL2rrdEeQPU2zfPzUd7W QZGoYrsn8Lb8FKpZ4JV7TtY6e53BaQyYXMXg60AsktM5B8TTAkcS4YY9k76uRC/C 7LUcoAJZ1EiV3/BD0BWHLsumCXxICZjGyrnpCoKAblet67LdbNIgy+D8QHw2XxtA aXg/095KMqwTd7t8nIJwuN3M9yzo8wRJJ032H2PBwlo877/XfckdpvHg3gMwF6SG e/JzMzIc/LYJakaEn3O7uDregi20lxfIfYWVq3/hwqr4Qdy4bGewUkJLKD6Nue+T qhmLKxRo7EpiND5ubxYQpV/N8JHC3L6cfw1IodKAh6GCEt2ymh0= =zvzI -----END PGP SIGNATURE----- --=-=-=--