bug#70706: closed ([PATCH] gnu: services: dns: Escape hatch for dnsmasq-configuration.)

[GNU bug Tracking System]

Your message dated Thu, 13 Jun 2024 22:43:42 +0200
with message-id <8734pginep.fsf@gnu.org>
and subject line Re: [bug#70706] [PATCH] gnu: services: dns: Escape hatch for 
dnsmasq-configuration.
has caused the debbugs.gnu.org bug report #70706,
regarding [PATCH] gnu: services: dns: Escape hatch for dnsmasq-configuration.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
70706: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=70706
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: services: dns: Escape hatch for dnsmasq-configuration.
>
>
>
>
> Date: 
>
> Wed,  1 May 2024 22:43:31 +0200
>
>
>
>
> * gnu/service/dns.scm: (<dnsmasq-configuration>)[extra-options]: Add.
> * doc/guix.texi: Document (<dnsmasq-configuration>)[extra-options].
> ---
>  doc/guix.texi        | 4 ++++
>  gnu/services/dns.scm | 7 +++++--
>  2 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/doc/guix.texi b/doc/guix.texi
> index 749d689ac1..17798becd5 100644
> --- a/doc/guix.texi
> +++ b/doc/guix.texi
> @@ -33498,6 +33498,10 @@ DNS Services
>  resolving MAC addresses is only possible if the client is in the local
>  network or obtained a DHCP lease from dnsmasq.
>  
> +@item @code{extra-options} (default: @code{'()})
> +This option provides an ``escape hatch'' for the user to provide arbitrary
> +command-line arguments to @command{dnsmasq} as a list of strings.
> +
>  @end table
>  @end deftp
>  
> diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm
> index 6608046909..043c34599c 100644
> --- a/gnu/services/dns.scm
> +++ b/gnu/services/dns.scm
> @@ -739,6 +739,8 @@ (define-record-type* <dnsmasq-configuration>
>                      (default #t))       ;boolean
>    (listen-addresses dnsmasq-configuration-listen-address
>                      (default '()))      ;list of string
> +  (extra-options    dnsmasq-configuration-extra-options
> +                    (default '()))      ;list of string
>    (resolv-file      dnsmasq-configuration-resolv-file
>                      (default "/etc/resolv.conf")) ;string
>    (no-resolv?       dnsmasq-configuration-no-resolv?
> @@ -798,7 +800,7 @@ (define (dnsmasq-shepherd-service config)
>       tftp-single-port? tftp-secure?
>       tftp-max tftp-mtu tftp-no-blocksize?
>       tftp-lowercase? tftp-port-range
> -     tftp-root tftp-unique-root)
> +     tftp-root tftp-unique-root extra-options)
>      (shepherd-service
>       (provision '(dnsmasq))
>       (requirement '(networking))
> @@ -877,7 +879,8 @@ (define (dnsmasq-shepherd-service config)
>                          (if (> (length tftp-unique-root) 0)
>                              (format #f "--tftp-unique-root=~a" 
> tftp-unique-root)
>                              (format #f "--tftp-unique-root")))
> -                       '()))
> +                       '())
> +                #$@extra-options)
>                 #:pid-file "/run/dnsmasq.pid"))
>       (stop #~(make-kill-destructor)))))
>  
>
> base-commit: 5c13ab50b9c7d44238c64e5337027f04ae1d9223
> --
> 2.41.0
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#70706] [PATCH] gnu: services: dns: Escape hatch for dnsmasq-configuration.
>
>
>
>
> Date: 
>
> Thu, 13 Jun 2024 22:43:42 +0200
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13)
>
>
>
>
> Sergey Trofimov <sarg@sarg.org.ru> skribis:
>
> > * gnu/service/dns.scm: (<dnsmasq-configuration>)[extra-options]: Add.
> > * doc/guix.texi: Document (<dnsmasq-configuration>)[extra-options].
>
> Applied, thanks!
>
>
> --- End Message ---