[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#77045] [PATCH v1] services: wireguard: Add the shepherd-requirement
From: |
Sergey Trofimov |
Subject: |
[bug#77045] [PATCH v1] services: wireguard: Add the shepherd-requirement field. |
Date: |
Tue, 18 Mar 2025 22:00:14 +0100 |
* gnu/services/vpn.scm (<wireguard-configuration>): Add
shepherd-requirement.
(wireguard-shepherd-service): Pass shepherd-requirement. Add
user-processes to requirements.
* doc/guix.texi (VPN Services):[wireguard]: Document it.
Change-Id: Ia85add5067f6f9e023b8d65d6ce067b98eeb111e
---
doc/guix.texi | 4 ++++
gnu/services/vpn.scm | 7 +++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 794afcd8c4..9352c56563 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -35739,6 +35739,10 @@ VPN Services
List of strings or G-expressions. These are script snippets which will
be executed after tearing down the interface.
+@item @code{shepherd-requirement} (default: @code{'()}) (type: list-of-symbols)
+A list of symbols naming Shepherd services that this service
+will depend on.
+
@item @code{table} (default: @code{"auto"})
The routing table to which routes are added, as a string. There are two
special values: @code{"off"} that disables the creation of routes
diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm
index 478a0d543e..3f1f8661d8 100644
--- a/gnu/services/vpn.scm
+++ b/gnu/services/vpn.scm
@@ -88,6 +88,7 @@ (define-module (gnu services vpn)
wireguard-configuration-post-up
wireguard-configuration-pre-down
wireguard-configuration-post-down
+ wireguard-configuration-shepherd-requirement
wireguard-configuration-table
wireguard-configuration-auto-start?
@@ -765,6 +766,8 @@ (define-record-type* <wireguard-configuration>
(default '()))
(post-down wireguard-configuration-post-down ;list of strings
(default '()))
+ (shepherd-requirement wireguard-configuration-shepherd-requirement ; list
of symbols
+ (default '()))
(table wireguard-configuration-table ;string
(default "auto"))
(auto-start? wireguard-configuration-auto-start? ;boolean
@@ -918,12 +921,12 @@ (define (endpoint-host-names peers)
(define (wireguard-shepherd-service config)
(match-record config <wireguard-configuration>
- (wireguard interface)
+ (wireguard interface shepherd-requirement)
(let ((wg-quick (file-append wireguard "/bin/wg-quick"))
(auto-start? (wireguard-configuration-auto-start? config))
(config (wireguard-configuration-file config)))
(list (shepherd-service
- (requirement '(networking))
+ (requirement `(networking user-processes ,@shepherd-requirement))
(provision (list (wireguard-service-name interface)))
(start #~(lambda _
(invoke #$wg-quick "up" #$config)))
base-commit: df799a61ef73451e587cb81942c7bfcbbade9e7e
prerequisite-patch-id: f9cc903b8048c8c6fde576fbf38ab110263020e3
prerequisite-patch-id: 220ddf11addf3a6c7ab3b349077bca6849241556
prerequisite-patch-id: fc7d254c8dc198bc2f083e1c8aea18960c73b165
--
2.48.1