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 ms5.migadu.com with LMTPS id fWSnJx8BA2SeoAAAbAwnHQ (envelope-from ) for ; Sat, 04 Mar 2023 09:28:15 +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 CK5UJx8BA2R+BwAA9RJhRA (envelope-from ) for ; Sat, 04 Mar 2023 09:28:15 +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 159362B247 for ; Sat, 4 Mar 2023 09:28:15 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=sarg.org.ru header.s=google header.b=C1hzxPqE; 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1677918495; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=Z1YHuGu7DuCPJKAyf9ff9SahXA2Se40R6WE06fQt+qA=; b=GTLxKLWmwdPVomMHhE9/tAlZEL/+Utorju6t4vGBNi2jxJyJaFlcGtJJqyLMSIF9dQ8A5o yZnuiB91mFUO4VJwYho1avW/TPEY0jTe5cSsnMxcfdaNOX7qmuwR0U5IE9O26r38Tf1q/k 0l+EoXcZWGfJ59KqkLLDeFI8N6KU8X2WLi0RgYd3T10hJl9WSOYtQ2d2owMnchjz3oUxfm d6r4nuqcc9bRZaJv2zrLUe4AqtU0PaOjVfmDs9Kh8VOJBI7XOh0okqeXDam8QYcChkJQqn KdWBcFrlEQONgJps4r660+xvMtguVCpYDcZeB2Re2LSUMHe+QjICkU5JxC8+NA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=sarg.org.ru header.s=google header.b=C1hzxPqE; 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=1677918495; a=rsa-sha256; cv=none; b=YLuHIxJ2RS4/hVMLFQBKs+EffwPc6jrzEsHlJl3fYdhF+FDyoOs9KTmN/pooaJgqRB3jUP 2Ykrp/H6QPIxLkfQV1q6X/t2quJdZGUaZEfdmud+Z/dRRmKxj+O5i8PGhiRyK0hGvoYleq cMi/ZNn5Ha8WIZDFBa8tpcy7fmkYWrhEbAfBjjRh+t1XmK7AkwsAlzg2OzqBNjX0b/Jw5P QX0F0jmLb3Kpe18ol8CtYPpZxv6/z6eTUagA2Ub431S52DY1bGlLVs32Ci7vwwLd+RU2kc +669W4Y/QVG6wk6wZNwl062SfLyGI2EuNEpsCCHiF+fVleQHe9EtqJ12+h6QIg== 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 Content-Transfer-Encoding: 8bit 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: X-Migadu-Spam-Score: -2.00 X-Spam-Score: -2.00 X-Migadu-Scanner: scn0.migadu.com X-Migadu-Queue-Id: 159362B247 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 X-TUID: oRYLZRcNWf93 --- 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)) -- 2.39.1