From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 27 15:07:02 2020 Received: (at submit) by debbugs.gnu.org; 27 Sep 2020 19:07:02 +0000 Received: from localhost ([127.0.0.1]:50461 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMc0j-0001Zg-SN for submit@debbugs.gnu.org; Sun, 27 Sep 2020 15:07:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:51052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMc0i-0001ZU-9t for submit@debbugs.gnu.org; Sun, 27 Sep 2020 15:07:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMc0i-0005ta-3L for guix-patches@gnu.org; Sun, 27 Sep 2020 15:07:00 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:51954) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMc0f-0004hv-J2 for guix-patches@gnu.org; Sun, 27 Sep 2020 15:06:59 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 35AE133682F4; Sun, 27 Sep 2020 21:06:55 +0200 (CEST) From: Danny Milosavljevic To: guix-patches@gnu.org Subject: [PATCH] services: dnsmasq: Add TFTP configuration. Date: Sun, 27 Sep 2020 21:06:30 +0200 Message-Id: <20200927190630.1753-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Tags: patch Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=85.13.145.193; envelope-from=dannym@scratchpost.org; helo=dd26836.kasserver.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/27 14:38:40 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/services/dns.scm (): Add TFTP configuration fields. (dnsmasq-shepherd-service): Use them. --- gnu/services/dns.scm | 70 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 3 deletions(-) diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index 9caa3611be..572880561c 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -757,7 +757,29 @@ cache.size = 100 * MB (cache-size dnsmasq-configuration-cache-size (default 150)) ;integer (negative-cache? dnsmasq-configuration-negative-cache? - (default #t))) ;boolean + (default #t)) ;boolean + (tftp-enable? dnsmasq-configuration-tftp-enable? + (default #f)) ;boolean + (tftp-no-fail? dnsmasq-configuration-tftp-no-fail? + (default #f)) ;boolean + (tftp-single-port? dnsmasq-configuration-tftp-single-port? + (default #f)) ;boolean + (tftp-secure? dnsmasq-tftp-secure? + (default #f)) ;boolean + (tftp-max dnsmasq-tftp-max + (default #f)) ;integer + (tftp-mtu dnsmasq-tftp-mtu + (default #f)) ;integer + (tftp-no-blocksize? dnsmasq-tftp-no-blocksize? + (default #f)) ;boolean + (tftp-lowercase? dnsmasq-tftp-lowercase? + (default #f)) ;boolean + (tftp-port-range dnsmasq-tftp-port-range + (default #f)) ;string + (tftp-root dnsmasq-tftp-root + (default "/var/empty,lo")) ;string + (tftp-unique-root dnsmasq-tftp-unique-root + (default #f))) ;"" or "ip" or "mac" (define dnsmasq-shepherd-service (match-lambda @@ -765,7 +787,12 @@ cache.size = 100 * MB no-hosts? port local-service? listen-addresses resolv-file no-resolv? servers - addresses cache-size negative-cache?) + addresses cache-size negative-cache? + tftp-enable? tftp-no-fail? + tftp-single-port? tftp-secure? + tftp-max tftp-mtu tftp-no-blocksize? + tftp-lowercase? tftp-port-range + tftp-root tftp-unique-root) (shepherd-service (provision '(dnsmasq)) (requirement '(networking)) @@ -794,7 +821,44 @@ cache.size = 100 * MB #$(format #f "--cache-size=~a" cache-size) #$@(if negative-cache? '() - '("--no-negcache"))) + '("--no-negcache")) + #$@(if tftp-enable? + '("--enable-tftp") + '()) + #$@(if tftp-no-fail? + '("--tftp-no-fail") + '()) + #$@(if tftp-single-port? + '("--tftp-single-port") + '()) + #$@(if tftp-secure? + '("--tftp-secure?") + '()) + #$@(if tftp-max + (list (format #f "--tftp-max=~a" tftp-max)) + '()) + #$@(if tftp-mtu + (list (format #f "--tftp-mtu=~a" tftp-mtu)) + '()) + #$@(if tftp-no-blocksize? + '("--tftp-no-blocksize") + '()) + #$@(if tftp-lowercase? + '("--tftp-lowercase") + '()) + #$@(if tftp-port-range + (list (format #f "--tftp-port-range=~a" + tftp-port-range)) + '()) + #$@(if tftp-root + (list (format #f "--tftp-root=~a" tftp-root)) + '()) + #$@(if tftp-unique-root + (list + (if (> (length tftp-unique-root) 0) + (format #f "--tftp-unique-root=~a" tftp-unique-root) + (format #f "--tftp-unique-root"))) + '())) #:pid-file "/run/dnsmasq.pid")) (stop #~(make-kill-destructor)))))) From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 27 15:27:18 2020 Received: (at 43653) by debbugs.gnu.org; 27 Sep 2020 19:27:18 +0000 Received: from localhost ([127.0.0.1]:50484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMcKM-00022o-LH for submit@debbugs.gnu.org; Sun, 27 Sep 2020 15:27:18 -0400 Received: from mout.web.de ([212.227.15.4]:48745) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMcKL-00022b-7d for 43653@debbugs.gnu.org; Sun, 27 Sep 2020 15:27:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1601234829; bh=QpGA8pvClSseGyZwzLrm2Ap9z9lSk2BljmZSqNQCb5k=; h=X-UI-Sender-Class:Subject:To:References:From:Date:In-Reply-To; b=byDgAyv7aigrRB5cLpPwCOJUr402v2N71lCb3QeIZpS6x1qUo4sBRgz/4a5ihYE3o cMwTLSnvEYdf43w0iMdbIQG/tZ+t6Zq6Y+Q+NXIkzHymPFddo6Y7sLkdA2xlpKq8sA QTiaIwQ43EFnp7LBZvlCzkY9ByVQ/m83RVeG4TwU= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.178.25] ([88.152.185.253]) by smtp.web.de (mrweb001 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MaJc8-1k79s52PnM-00JuYz; Sun, 27 Sep 2020 21:27:09 +0200 Subject: Re: [bug#43653] [PATCH] services: dnsmasq: Add TFTP configuration. To: Danny Milosavljevic , 43653@debbugs.gnu.org References: <20200927190630.1753-1-dannym@scratchpost.org> From: Jonathan Brielmaier Message-ID: Date: Sun, 27 Sep 2020 21:26:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.3.0 MIME-Version: 1.0 In-Reply-To: <20200927190630.1753-1-dannym@scratchpost.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: de-DE Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:Cpo6CsgAWBTJeDhg/2I6KM5QB1gSBhI1hEQfSBY4IKw36wGI72P IRQ6IEOMayPAQpXqFfgL4jNYCYlp60wnNWi8GDYxBlAw1edyQhTWRmQpSNydpVD08xQ292h LRO3QGalue9i4VaoISRja0EJ4QfZEBvHzS087IA8Kf/fpN3euPIkdXijwS8LTdtjFv2j+b6 Uot7zrwirf1zlq5wVzskQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:y5ouO2oEk8s=:JOfgbJViQaov9pMeIcRW+I o7cHoRxMoWmWQGSovNbChnm7CgkJ6wEsB3aWQ400lnbgLtBK6vTa5tNxObuBHgGvySZLlq2jL 3CPZGZrYjmo7B7h1/5PZk93uDTXEnEB0KuQsgPUzESyvHvcEgk4gTRFk1mLJjf+tCsvHr3sh2 zC/RJQoRLTpJE6ssbc9L5i7RpoHlz5jG82tgfaklPrsZpr1tuN4An/i7dCdg5afcBGPBY3/GN QWPSuftCNi+wN8ffV2hgoAKVajVge/LtNhTFhX5PSj6DecziwgXkxPcSIFAK46OxalYPT5z7E VROEojuDv/OsKGMt2MEbWzS1VU1PE4uvau9b2XEDcqWflj3Xf4F83R8jC6+WYLk7ih32Y3nz3 FJjKXltwSQiNPXNIvREWIAyA2L7bpQpcSX0DTI4mZ6iwGA3fppGKXZmp3xFhxvbQ0OAODoPV+ Eyxz1WuM81jk+s9WICFu/lWPAxtc24bA/h/Twms5gD3Kbgcnyj+hVlRrFLNKEGbAZpRkuM5nO Crw0QtdsqnSeW1JGTYTsrjy8SrwQ0+YwZZb37m1G6kTKZrxmpOXFzIm2LJZFVcjmmcQSbI0ZZ NZvF6OinoiU5+6sL0agndhoKtdOXpFP3NJjuQzYaZSsa3LK/HHNCDJqCfFUQQ2QNKucZgzbOZ j1Ymm9fRbmNbHCXLdISAZTkfWza9+tNrj5qXc/rrYmLaIpfYLn/Wwn7aUVMhxq3Lqp+CvmEao 3CuGT8tbuKEagC/MK2nRq5guLaWYBoGRNORQZjbxm+NzJWJmhcY7s652yDfPgmfCrD2pUJfTX rQQuy562oManmq97SPfb1vW74fzM+fjtQ8I+WRIVFigtdBthjJoAJcXiAxynMFeK7t2pTUUCq zHbUvgxXy2Ljm9heIS5Zx4aGkDtuihBpM56Pb031zHiIff6kbQbBfaw30uPuVtLEuRSc1CLlN E1Pk3wp/V4sIb8+2PJ/rg3J9A/PWrRACm+AURvY/EqfKhUVPfaBY1iAAeWLMhFyV0KerCwNyA e26i2oh8fJv5yQD5yleaEBF3hktc3EB6sjqWQAxIDnRW8gSl0Radzwk68HfL3AduTpE9eMtcV tLAVdSD2cpKw8miHM87YMVpdLHKNFEo+/HSOlKdzurGM1arjy6myJE1IK21v6d8mzrS5WEnLP m4EoTNrsWK5n7tQv63XiczlDDZt91HVDGWo43fmxGkxtMPHqoCbwdUTVYAuX2No1F8oFFz2YI IkCdehKhlfgyw9BTdATdyXxQCffjMhJNVyZrLVA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 43653 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On 27.09.20 21:06, Danny Milosavljevic wrote: > * gnu/services/dns.scm (): Add TFTP configuration > fields. > (dnsmasq-shepherd-service): Use them. > --- > gnu/services/dns.scm | 70 ++++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 67 insertions(+), 3 deletions(-) I think some documentation couldn't hurt, so that user can have a chance to learn about the TFTP possiblilities of our dnsmasq service :) From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 06 02:15:57 2020 Received: (at 43653-done) by debbugs.gnu.org; 6 Oct 2020 06:15:57 +0000 Received: from localhost ([127.0.0.1]:51376 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPgGT-0004Lw-Ib for submit@debbugs.gnu.org; Tue, 06 Oct 2020 02:15:57 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:44996) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPgGR-0004Ln-Bd for 43653-done@debbugs.gnu.org; Tue, 06 Oct 2020 02:15:56 -0400 Received: from localhost (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 74295336881C; Tue, 6 Oct 2020 08:15:53 +0200 (CEST) Date: Tue, 6 Oct 2020 08:15:26 +0200 From: Danny Milosavljevic To: Jonathan Brielmaier Subject: Re: [bug#43653] [PATCH] services: dnsmasq: Add TFTP configuration. Message-ID: <20201006081526.3de1028d@scratchpost.org> In-Reply-To: References: <20200927190630.1753-1-dannym@scratchpost.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/xICLM_iOAkTfqzbNmaSc7DR"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 43653-done Cc: 43653-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --Sig_/xICLM_iOAkTfqzbNmaSc7DR Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi, On Sun, 27 Sep 2020 21:26:32 +0200 Jonathan Brielmaier wrote: > On 27.09.20 21:06, Danny Milosavljevic wrote: > > * gnu/services/dns.scm (): Add TFTP configuration > > fields. > > (dnsmasq-shepherd-service): Use them. > > --- > > gnu/services/dns.scm | 70 ++++++++++++++++++++++++++++++++++++++++++-- > > 1 file changed, 67 insertions(+), 3 deletions(-) =20 >=20 > I think some documentation couldn't hurt, so that user can have a chance > to learn about the TFTP possiblilities of our dnsmasq service :) Added docs and pushed to guix master as commit 34d1c0a03b51fdaef26a3bc630ab= 096da740e1d6. --Sig_/xICLM_iOAkTfqzbNmaSc7DR Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl98C34ACgkQ5xo1VCww uqX5gAf+NwQW9GeqzWY3UU7kW0oGwq2aClQv6BBYDAziQ18q8iZiEKtvy8EUEuM2 tN+Df1lZBjEU/AeAW06PT1VVrcWBJqeY5FaVyCzR4ODRpuKCpPkNKm0Y6yRLDs95 02RldM+G9SzhGTdTBn+EWSn2vwbGVtcdTjuA2pO403tE4aTmgZvvTOBrE0w9Eaqu zLcq63IIdFq1Fl7b2G8qc52Wur+ztdOtuBCdX7tY90XDrKT9yGuGLpA3+GVX/Oqs oVBQxePZxl4qMO0e/FVC7tdQEphFhPfYTZNMf5MD52uzf4gr4gZEif0oRb1gfloS QoHlXSildaIRKRQBJS8gak67Hze5lw== =XT/W -----END PGP SIGNATURE----- --Sig_/xICLM_iOAkTfqzbNmaSc7DR-- From unknown Tue Jun 24 05:12:20 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 03 Nov 2020 12:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator