From patchwork Sat Mar 4 08:40:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 47606 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 B004716D28; Sat, 4 Mar 2023 08:41:26 +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=ham 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 E1B8016C35 for ; Sat, 4 Mar 2023 08:41:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYNS0-0004NG-0S; Sat, 04 Mar 2023 03:41: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 1pYNRy-0004Mb-KY for guix-patches@gnu.org; Sat, 04 Mar 2023 03:41: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 1pYNRu-0008TK-CI for guix-patches@gnu.org; Sat, 04 Mar 2023 03:41:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pYNRt-00028a-Pv for guix-patches@gnu.org; Sat, 04 Mar 2023 03:41:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61956] [PATCH v2] services: dns: Extend dnsmasq-configuration. References: <20230304082719.29479-1-sarg@sarg.org.ru> In-Reply-To: <20230304082719.29479-1-sarg@sarg.org.ru> Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Mar 2023 08:41:01 +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: 61956@debbugs.gnu.org Cc: Sergey Trofimov Received: via spool by 61956-submit@debbugs.gnu.org id=B61956.16779192198149 (code B ref 61956); Sat, 04 Mar 2023 08:41:01 +0000 Received: (at 61956) by debbugs.gnu.org; 4 Mar 2023 08:40:19 +0000 Received: from localhost ([127.0.0.1]:35220 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYNRC-00027N-QM for submit@debbugs.gnu.org; Sat, 04 Mar 2023 03:40:19 -0500 Received: from mail-ed1-f52.google.com ([209.85.208.52]:44748) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYNR9-000278-OG for 61956@debbugs.gnu.org; Sat, 04 Mar 2023 03:40:17 -0500 Received: by mail-ed1-f52.google.com with SMTP id ay14so15508585edb.11 for <61956@debbugs.gnu.org>; Sat, 04 Mar 2023 00:40:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1677919209; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xCZCoX0ymBgKZ00bX7jQD/REDWiZkqnM1NKJ6j+1P+Y=; b=Fv3edu/3GIvAJChGeYczbGhAWuMs+NVhfbJQ4JyYHLMJh94DYx7LRzObYu3OgzVpWD S0kggrJGglRpspJM10N3UQbShKy+YTXuMEFbVwtTShEUkz2eN6KWJhbcc1cb1NlbOaBN zzf/60Xa9jp6Uo33WMrjX3i8WLiMEw6ao1OgY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677919209; 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=xCZCoX0ymBgKZ00bX7jQD/REDWiZkqnM1NKJ6j+1P+Y=; b=aR0H1oGu6P6lfj11P0GRFRIOKGa/lkMkNTxvzp+7B4Div/bJXD5X83vTk7Oi//2Px0 HHvhEee/uY8sFYtW4xSZ4JNYa+ao4B+htPkAU91o7kMjpL03ELdcuSRvEVqfzqn7/KXp ozq+H1PR2VKkTKcy1m6abDeKc7QW/HHUldClN/Mu60+ngROyIwOhWzJnn3AtUebARGJp VCazrI4HCG8SQoY9vgtqiBHcCJ5oTnSUKnU1EVGbo4qtcy/la7Gu6okOmSewX6siV0zf 9i6TAa5AXH7s4aZQFDJO23hD8WRCgd1m8kc4FVEsT5M0EP5SXVYmXlQGOzbcKMrsFge7 z5bg== X-Gm-Message-State: AO0yUKXZqAxES68omoMTUYNiaXAxjB+/6jtgag8eRQog07xXrenHGYvF UnptimY99rnLej/8BRDvV3foAth0E/fhrgAYfmM= X-Google-Smtp-Source: AK7set9rRO3J8ogYz7FG2ilugX2WLeM3ygUaXRaATKqdo0bRsPAtr5JfOrEWtbNmVIy7CDLO0Qv/Og== X-Received: by 2002:a17:907:9b03:b0:8aa:be5c:b7c5 with SMTP id kn3-20020a1709079b0300b008aabe5cb7c5mr4557021ejc.41.1677919209504; Sat, 04 Mar 2023 00:40:09 -0800 (PST) Received: from localhost ([95.168.153.94]) by smtp.gmail.com with ESMTPSA id l6-20020a50d6c6000000b004bdcc480c41sm2144918edj.96.2023.03.04.00.40.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Mar 2023 00:40:09 -0800 (PST) From: Sergey Trofimov Date: Sat, 4 Mar 2023 09:40:30 +0100 Message-Id: <20230304084030.32117-1-sarg@sarg.org.ru> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 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 --- 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. +@item @code{servers-file} (default: @code{#f}) +Specify file containing upstream servers. This file is re-read when dnsmasq 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 (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))