This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 37ef4fb3ee7 services: yggdrasil: Set http_proxy environment variables
correctly.
37ef4fb3ee7 is described below
commit 37ef4fb3ee73be1f369bb50a227d982cbce4bbbd
Author: Nigko Yerden <[email protected]>
AuthorDate: Tue Nov 3 13:41:23 2026 +0500
services: yggdrasil: Set http_proxy environment variables correctly.
Fixes https://codeberg.org/guix/guix/pulls/9380#issuecomment-27079881.
* gnu/services/networking.scm (yggdrasil-shepherd-service)[extra-env]:
Add local variable for gexp containing additional environment variables
list.
[start]<#:environment-variables>: Append environment variables from ungexp
of `extra-anv`.
Signed-off-by: Vagrant Cascadian <[email protected]>
---
gnu/services/networking.scm | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index da687c2c346..c757174b502 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -2671,22 +2671,23 @@ local servers publicly accessible on the web, even
behind NATs and firewalls."))
#$(symbol->string (yggdrasil-configuration-log-level config))
"-logto"
#$(symbol->string (yggdrasil-configuration-log-to config)))))
+ (define extra-env
+ #~(let ((proxy #$(yggdrasil-configuration-http-proxy config)))
+ (if proxy
+ (list (string-append "http_proxy=" proxy)
+ (string-append "https_proxy=" proxy))
+ '())))
(list (shepherd-service
(documentation "Connect to the Yggdrasil mesh network")
(provision '(yggdrasil))
(requirement '(networking))
- (start (let ((proxy (yggdrasil-configuration-http-proxy config)))
- #~(make-forkexec-constructor
- #$yggdrasil-command
- #:log-file "/var/log/yggdrasil.log"
- #:group "yggdrasil"
- #:environment-variables
- (append
- #$(if proxy
- (list (string-append "http_proxy=" proxy)
- (string-append "https_proxy=" proxy))
- '())
- (default-environment-variables)))))
+ (start #~(make-forkexec-constructor
+ #$yggdrasil-command
+ #:log-file "/var/log/yggdrasil.log"
+ #:group "yggdrasil"
+ #:environment-variables
+ (append #$extra-env
+ (default-environment-variables))))
(stop #~(make-kill-destructor)))))
(define %yggdrasil-accounts