From patchwork Sat Mar 4 08:27:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 47605 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 90CF616D22; Sat, 4 Mar 2023 08:28:17 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 5550B16C35 for ; Sat, 4 Mar 2023 08:28:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYNFR-0007Bs-3S; Sat, 04 Mar 2023 03:28:09 -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 1pYNFN-0007Ba-Bs for guix-patches@gnu.org; Sat, 04 Mar 2023 03:28:06 -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 1pYNFK-00052d-1Z for guix-patches@gnu.org; Sat, 04 Mar 2023 03:28:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pYNFJ-0001o8-Qy for guix-patches@gnu.org; Sat, 04 Mar 2023 03:28:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61956] [PATCH] services: dns: Extend dnsmasq-configuration. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Mar 2023 08:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61956 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61956@debbugs.gnu.org Cc: Sergey Trofimov X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16779184336882 (code B ref -1); Sat, 04 Mar 2023 08:28:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Mar 2023 08:27:13 +0000 Received: from localhost ([127.0.0.1]:35214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYNEX-0001mw-Ad for submit@debbugs.gnu.org; Sat, 04 Mar 2023 03:27:13 -0500 Received: from lists.gnu.org ([209.51.188.17]:60096) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYNEV-0001mm-K1 for submit@debbugs.gnu.org; Sat, 04 Mar 2023 03:27:12 -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 1pYNEV-000730-DJ for guix-patches@gnu.org; Sat, 04 Mar 2023 03:27:11 -0500 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pYNET-0004uj-Er for guix-patches@gnu.org; Sat, 04 Mar 2023 03:27:11 -0500 Received: by mail-ed1-x52e.google.com with SMTP id f13so19119771edz.6 for ; Sat, 04 Mar 2023 00:27:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1677918426; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Z1YHuGu7DuCPJKAyf9ff9SahXA2Se40R6WE06fQt+qA=; b=C1hzxPqE+nqBSg+KHaX2V1iUR85HkmBprVou+QtUNArxJmC5hI18I14/Y2h1A0ma0k TyKrSLBd/pl7WmVMZf2ic8E7wjWqCga/263pnXJSoFUdM/qQBolAk5R4j+nbPHYHzg8s zXvVnM621m263WNV9k1CK5tPXGalBZc2zfulE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677918426; 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=Z1YHuGu7DuCPJKAyf9ff9SahXA2Se40R6WE06fQt+qA=; b=nV2wBENddWeCs7VgVQndogzYvlPeM/UNbGpGSFcpyu69eltbBeuylgwJocNp2fpteN 4cNs6+ft/t16ksI6fea15t+ijXder4Cd2hYu4GaYGt2JZeKAqhHQskUFWcff0yvIYTHb AP1iTsFoSM2+c3RVmIeLEyobBXD6YXyhr8ujXEMcl1Afg+K48DKT9HAnmGQy9h9pk/iG m7CPfjDQg05OAGfJU/ZmffXwZuQt5V27UHyRql1jfdgTiu6Mxmb+Dt1RfuQ/7diXafB7 MvsdcTHcWA+PHo5oAvvqLmYy3tXkj5SH+lRuw4uaEjjWP2akh4uJ6EfnaSlAZJcMg2cF WQRg== X-Gm-Message-State: AO0yUKW7zDOr97+F6Hp1vfSpySHdQiIL2v/iChYZPvaQqx5O9CS/PCVN 1x2bMMYnEGnwEllOhSBoLJNEf2K2k9GsRd/0MGw= X-Google-Smtp-Source: AK7set+HoO8dwyvLAMKdDHgEVNg7KQBZLfq873yOmh1CcV/Kb2jrzMzsvMWqhE7rFSNcIXVi6+GQYA== X-Received: by 2002:a17:906:6c9:b0:8b1:77bf:5b9f with SMTP id v9-20020a17090606c900b008b177bf5b9fmr4283302ejb.13.1677918425906; Sat, 04 Mar 2023 00:27:05 -0800 (PST) Received: from localhost ([95.168.153.94]) by smtp.gmail.com with ESMTPSA id y13-20020a1709060a8d00b008bbc4f3bceesm1829306ejf.118.2023.03.04.00.27.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Mar 2023 00:27:05 -0800 (PST) From: Sergey Trofimov Date: Sat, 4 Mar 2023 09:27:19 +0100 Message-Id: <20230304082719.29479-1-sarg@sarg.org.ru> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Received-SPF: none client-ip=2a00:1450:4864:20::52e; envelope-from=sarg@sarg.org.ru; helo=mail-ed1-x52e.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=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 --- gnu/services/dns.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 (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=~a" servers-file)) + '()) #$@(map (cut format #f "--server=~a" <>) servers) #$@(map (cut format #f "--address=~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=~a" tftp-max))