mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-31 06:46:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: wireguard: Support lists of gexps for most fields.

Browse source 
In order to support more flexibility in Wireguard configuration, ungexp the
configuration fields directly instead of ungexp-splicing a sexp
calculator. This allows for the fields to take arbitrary gexps instead of only
strings which is particularly helpful for the Pre/Post Up/Down commands.

* gnu/services/vpn.scm (wireguard-configuration-file): Ungexp configuration
lists instead of ungexp-splicing the code surrounding them.
* doc/guix.texi (VPN Services)[wireguard]: Document it.

Change-Id: If074cbb78473b6fd34e0e4e990d2ed268001d6c7
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
This commit is contained in:
Richard Sent 2024-12-04 15:59:35 -05:00 committed by Mathieu Othacehe
parent 1a17a0f90d
commit 0972a27572
No known key found for this signature in database
GPG key ID: 8354763531769CA6
2 changed files with 35 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
doc/guix.texi
View file

@ -34603,13 +34603,15 @@ The wireguard package to use for this service.
The interface name for the VPN.
@item @code{addresses} (default: @code{'("10.0.0.1/32")})
The IP addresses to be assigned to the above interface.
List of strings or G-expressions which represent 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{'())})
The DNS server(s) to announce to VPN clients via DHCP.
List of strings or G-expressions which represent the DNS server(s) to
announce to VPN clients via DHCP.
@item @code{monitor-ips?} (default: @code{#f})
@cindex Dynamic IP, with Wireguard
@ -34654,16 +34656,20 @@ The authorized peers on this interface. This is a list of
@var{wireguard-peer} records.
@item @code{pre-up} (default: @code{'()})
The script commands to be run before setting up the interface.
List of strings or G-expressions. These are script snippets which will
be executed before setting up the interface.
@item @code{post-up} (default: @code{'()})
The script commands to be run after setting up the interface.
List of strings or G-expressions. These are script snippets which will
be executed after setting up the interface.
@item @code{pre-down} (default: @code{'()})
The script commands to be run before tearing down the interface.
List of strings or G-expressions. These are script snippets which will
be executed before tearing down the interface.
@item @code{post-down} (default: @code{'()})
The script commands to be run after tearing down the interface.
List of strings or G-expressions. These are script snippets which will
be executed after tearing down the interface.
@item @code{table} (default: @code{"auto"})
The routing table to which routes are added, as a string. There are two
@ -34689,8 +34695,8 @@ The optional endpoint for the peer, such as
The peer public-key represented as a base64 string.
@item @code{preshared-key} (default: @code{#f})
An optional pre-shared key file for this peer. The given file will not
be autogenerated.
An optional pre-shared key file for this peer that can be either a
string or a G-expression. The given file will not be autogenerated.
@item @code{allowed-ips}
A list of IP addresses from which incoming traffic for this peer is

41
gnu/services/vpn.scm
View file

@ -12,6 +12,7 @@
;;; Copyright © 2022 Cameron V Chaparro <cameron@cameronchaparro.com>
;;; Copyright © 2022 Timo Wilken <guix@twilken.net>
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2024 Richard Sent <richard@freakingpenguin.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -800,33 +801,33 @@ (define (peers->preshared-keys peer keys)
(define lines
(list
"[Interface]"
#$@(if (null? addresses)
'()
(list (format #f "Address = ~{~a~^, ~}"
addresses)))
(if (null? '#$addresses)
""
(format #f "Address = ~{~a~^, ~}"
(list #$@addresses)))
(format #f "~@[Table = ~a~]" #$table)
#$@(if (null? pre-up)
'()
(list (format #f "~{PreUp = ~a~%~}" pre-up)))
(if (null? '#$pre-up)
""
(format #f "~{PreUp = ~a~%~}" (list #$@pre-up)))
(if #$private-key
(format #f "PostUp = ~a set %i private-key ~a\
~{ peer ~a preshared-key ~a~}"
#$(file-append wireguard "/bin/wg")
#$private-key '#$peer-keys)
#$private-key (list #$@peer-keys))
"")
#$@(if (null? post-up)
'()
(list (format #f "~{PostUp = ~a~%~}" post-up)))
#$@(if (null? pre-down)
'()
(list (format #f "~{PreDown = ~a~%~}" pre-down)))
#$@(if (null? post-down)
'()
(list (format #f "~{PostDown = ~a~%~}" post-down)))
(if (null? '#$post-up)
""
(format #f "~{PostUp = ~a~%~}" (list #$@post-up)))
(if (null? '#$pre-down)
""
(format #f "~{PreDown = ~a~%~}" (list #$@pre-down)))
(if (null? '#$post-down)
""
(format #f "~{PostDown = ~a~%~}" (list #$@post-down)))
(format #f "~@[ListenPort = ~a~]" #$port)
#$@(if (null? dns)
'()
(list (format #f "DNS = ~{~a~^, ~}" dns)))))
(if (null? '#$dns)
""
(format #f "DNS = ~{~a~^, ~}" (list #$@dns)))))
(mkdir #$output)
(chdir #$output)