bug#52689: closed ([PATCH] services: wireguard: Add DNS config field.)

[GNU bug Tracking System]

Your message dated Wed, 22 Dec 2021 09:09:10 +0100
with message-id <87pmppqcwp.fsf_-_@gnu.org>
and subject line Re: bug#52689: [PATCH] services: wireguard: Add DNS config 
field.
has caused the debbugs.gnu.org bug report #52689,
regarding [PATCH] services: wireguard: Add DNS config field.
to be marked as done.

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


-- 
52689: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=52689
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] services: wireguard: Add DNS config field.
>
>
>
>
> Date: 
>
> Mon, 20 Dec 2021 17:51:53 -0600
>
>
>
>
> From: Nathan Dehnel <5498361+Gooberpatrol66@users.noreply.github.com>
>
> * gnu/services/vpn.scm (wireguard-configuration): Add dns field
> * doc/guix.texi: Document dns field
> ---
>  doc/guix.texi        |  3 +++
>  gnu/services/vpn.scm | 11 +++++++++--
>  2 files changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/doc/guix.texi b/doc/guix.texi
> index aca88cdada..8e9cd8df18 100644
> --- a/doc/guix.texi
> +++ b/doc/guix.texi
> @@ -28601,6 +28601,9 @@ The IP addresses to be assigned to the above interface.
>  @item @code{port} (default: @code{51820})
>  The port on which to listen for incoming connections.
>  
> +@item @code{dns} (default: @code{#f})
> +The DNS server(s) to announce to VPN clients via DHCP.
> +
>  @item @code{private-key} (default: @code{"/etc/wireguard/private.key"})
>  The private key file for the interface.  It is automatically generated if
>  the file does not exist.
> diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm
> index 6004e41d8d..1a8f2c8d6a 100644
> --- a/gnu/services/vpn.scm
> +++ b/gnu/services/vpn.scm
> @@ -67,6 +67,7 @@ (define-module (gnu services vpn)
>              wireguard-configuration-interface
>              wireguard-configuration-addresses
>              wireguard-configuration-port
> +            wireguard-configuration-dns
>              wireguard-configuration-private-key
>              wireguard-configuration-peers
>  
> @@ -715,7 +716,9 @@ (define-record-type* <wireguard-configuration>
>    (private-key        wireguard-configuration-private-key ;string
>                        (default "/etc/wireguard/private.key"))
>    (peers              wireguard-configuration-peers ;list of <wiregard-peer>
> -                      (default '())))
> +                      (default '()))
> +  (dns                wireguard-configuration-dns ;string
> +                      (default #f)))
>  
>  (define (wireguard-configuration-file config)
>    (define (peer->config peer)
> @@ -739,7 +742,7 @@ (define (peer->config peer)
>                    "\n"))))
>  
>    (match-record config <wireguard-configuration>
> -    (wireguard interface addresses port private-key peers)
> +    (wireguard interface addresses port private-key peers dns)
>      (let* ((config-file (string-append interface ".conf"))
>             (peers (map peer->config peers))
>             (config
> @@ -755,6 +758,7 @@ (define (peer->config peer)
>  Address = ~a
>  PostUp = ~a set %i private-key ~a
>  ~a
> +~a
>  ~{~a~^~%~}"
>                                 #$(string-join addresses ",")
>                                 #$(file-append wireguard "/bin/wg")
> @@ -762,6 +766,9 @@ (define (peer->config peer)
>                                 #$(if port
>                                       (format #f "ListenPort = ~a" port)
>                                       "")
> +                               #$(if dns
> +                                     (format #f "DNS = ~a" (string-join dns 
> ","))
> +                                     "")
>                                 (list #$@peers)))))))))
>        (file-append config "/" config-file))))
>  
> -- 
> 2.33.1
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#52689: [PATCH] services: wireguard: Add DNS config field.
>
>
>
>
> Date: 
>
> Wed, 22 Dec 2021 09:09:10 +0100
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux)
>
>
>
>
> Hello,
>
> I added your copyright and pushed with an edited commit message.
>
> Thanks,
>
> Mathieu
>
>
> --- End Message ---