* [bug#52689] [PATCH] services: wireguard: Add DNS config field.
@ 2021-12-20 23:51 Nathan Dehnel
2021-12-21 20:18 ` Nathan Dehnel
0 siblings, 1 reply; 3+ messages in thread
From: Nathan Dehnel @ 2021-12-20 23:51 UTC (permalink / raw)
To: 52689; +Cc: Nathan Dehnel
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#52689] [PATCH] services: wireguard: Add DNS config field.
2021-12-20 23:51 [bug#52689] [PATCH] services: wireguard: Add DNS config field Nathan Dehnel
@ 2021-12-21 20:18 ` Nathan Dehnel
2021-12-22 8:09 ` bug#52689: " Mathieu Othacehe
0 siblings, 1 reply; 3+ messages in thread
From: Nathan Dehnel @ 2021-12-21 20:18 UTC (permalink / raw)
To: 52689; +Cc: Nathan Dehnel
* gnu/services/vpn.scm (wireguard-configuration): Add dns field
* doc/guix.texi: Document dns field
---
Redid the patch to change the comment from string to list of strings
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..4ea9bcc12e 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 ;list of strings
+ (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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#52689: [PATCH] services: wireguard: Add DNS config field.
2021-12-21 20:18 ` Nathan Dehnel
@ 2021-12-22 8:09 ` Mathieu Othacehe
0 siblings, 0 replies; 3+ messages in thread
From: Mathieu Othacehe @ 2021-12-22 8:09 UTC (permalink / raw)
To: Nathan Dehnel; +Cc: 52689-done
Hello,
I added your copyright and pushed with an edited commit message.
Thanks,
Mathieu
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-22 8:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-20 23:51 [bug#52689] [PATCH] services: wireguard: Add DNS config field Nathan Dehnel
2021-12-21 20:18 ` Nathan Dehnel
2021-12-22 8:09 ` bug#52689: " Mathieu Othacehe
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).