From patchwork Fri Mar 10 08:36:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 47834 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 AA91216E43; Fri, 10 Mar 2023 08:37:19 +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 276CB16D51 for ; Fri, 10 Mar 2023 08:37:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paYFP-0005Wy-Ta; Fri, 10 Mar 2023 03:37: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 1paYFK-0005W1-F6 for guix-patches@gnu.org; Fri, 10 Mar 2023 03:37:03 -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 1paYFJ-0003xP-UQ for guix-patches@gnu.org; Fri, 10 Mar 2023 03:37:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1paYFJ-0007e0-MQ for guix-patches@gnu.org; Fri, 10 Mar 2023 03:37:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61956] [PATCH v3] services: dns: Extend dnsmasq-configuration. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 10 Mar 2023 08:37: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.167843739029345 (code B ref 61956); Fri, 10 Mar 2023 08:37:01 +0000 Received: (at 61956) by debbugs.gnu.org; 10 Mar 2023 08:36:30 +0000 Received: from localhost ([127.0.0.1]:53654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paYEo-0007dD-2o for submit@debbugs.gnu.org; Fri, 10 Mar 2023 03:36:30 -0500 Received: from mail-ed1-f52.google.com ([209.85.208.52]:36777) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paYEl-0007cy-Gg for 61956@debbugs.gnu.org; Fri, 10 Mar 2023 03:36:28 -0500 Received: by mail-ed1-f52.google.com with SMTP id da10so17441997edb.3 for <61956@debbugs.gnu.org>; Fri, 10 Mar 2023 00:36:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1678437381; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xXMd9WXN+zysi1OGio2CKqXfIuGn8zL/QdpXwVEWMiY=; b=jPhdR0SEVMFDefmWa4AOdPLR7wjBWt1yc+3U9dsMG1XQ1hSB2ZQ9qVnNj1CkLbE6tG eGSENKHSPfHFXGrguf7kWwpDpznbEC0uKLaLp8NjZzxogBLmdcE4yelAWKddjwnecUzp GmpVObmbl+Y/cQ07S7NyprY5Hjp3dg5JW/e7E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678437381; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xXMd9WXN+zysi1OGio2CKqXfIuGn8zL/QdpXwVEWMiY=; b=LkrU13eUU9FPMyYPMRpL7eyBugPjirqVZNsfzLTA7ucfADuGRKOLbQ7QpTHS53jMXC BuqK1VuTZkLmgSmi57ydFGJ72OZv6NOu/6AuI3T4C715KJkFB3lJkG3OukSMXSbizm5c 5Vx86VKDUEeWNQeya+uK2GzrQ+v1bulqaYTibyD93g8t7aROzJnUBNSXQkNKJWnie0OQ z7m0vXI9AM5Tqfwl+cSftf4b00cj1unQeRY4UorwoBCaKQKCyfMJIwR5jVPou+BPuCPr TTgEPQ/euustdRkWh0BJNzWdsHdHQNIoRw+WKP9kDpqCwaSAh5Qf6lBXpXdXWJxrW/V/ Ahdw== X-Gm-Message-State: AO0yUKXdCGMr3By/2r2VWJJ8K+dFu8nTL50L5TML9DRDAElKZqv20G+O N2TrKpEaJFWBQJcbxmgEqE+JHBC2+MR0K3Y6wWSoZA== X-Google-Smtp-Source: AK7set8jBJ+gNSLM0zxICY6XvPm5yKkK3b819GQlRycHUocCHPb4tbtq/xalrIoKLl2oSQ7fML2VUw== X-Received: by 2002:a17:906:4a5a:b0:87b:bbdc:468 with SMTP id a26-20020a1709064a5a00b0087bbbdc0468mr23613765ejv.70.1678437381028; Fri, 10 Mar 2023 00:36:21 -0800 (PST) Received: from localhost ([95.168.145.203]) by smtp.gmail.com with ESMTPSA id g18-20020a50d0d2000000b004e7ffb7db11sm531012edf.76.2023.03.10.00.36.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 00:36:20 -0800 (PST) From: Sergey Trofimov Date: Fri, 10 Mar 2023 09:36:13 +0100 Message-Id: <20230310083612.12020-1-sarg@sarg.org.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <87ilf9cb5p.fsf@trop.in> References: <87ilf9cb5p.fsf@trop.in> 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 * gnu/service/dns.scm: ()[servers-file]: Add. * doc/guix.texi: Document ()[servers-file]. --- 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 6671ba9305..f62af051ab 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 32fb8c0664..7ff34babdc 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))