tribes/guix
1
0
Fork 1
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-28 03:51:53 +02:00
Code Activity

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
2 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gnu/services/vpn.scm
+21 -20
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 @@ strongSwan.")))
(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)