mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 07:26:13 -05:00
services: syncthing: incorrect guessing of HOME variable
Fixed the issue described here: https://lists.gnu.org/archive/html/help-guix/2024-01/msg00034.html Fix `syncthing-shepherd-service` failing to guess the correct `HOME` environment variable when it's `<syncthing-configuration>` does not have a value for the `home` or `user` fields. * gnu/services/syncthing.scm (syncthing-shepherd-service): Change ‘HOME’ value in #:environment-variables argument. Change-Id: I102bfe5feba1ebb349a0cde1c987c0c10ebbab7a Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
parent
0b65a43cf8
commit
a1d367d6ee
1 changed files with 9 additions and 1 deletions
|
@ -73,7 +73,15 @@ (define syncthing-shepherd-service
|
||||||
#:user #$(and (not home-service?) user)
|
#:user #$(and (not home-service?) user)
|
||||||
#:group #$(and (not home-service?) group)
|
#:group #$(and (not home-service?) group)
|
||||||
#:environment-variables
|
#:environment-variables
|
||||||
(append (list (string-append "HOME=" (or #$home (passwd:dir (getpw #$user))))
|
(append
|
||||||
|
(list
|
||||||
|
(string-append "HOME="
|
||||||
|
(or #$home
|
||||||
|
(passwd:dir
|
||||||
|
(getpw (if (and #$home-service?
|
||||||
|
(not #$user))
|
||||||
|
(getuid)
|
||||||
|
#$user)))))
|
||||||
"SSL_CERT_DIR=/etc/ssl/certs"
|
"SSL_CERT_DIR=/etc/ssl/certs"
|
||||||
"SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt")
|
"SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt")
|
||||||
(filter (negate ;XXX: 'remove' is not in (guile)
|
(filter (negate ;XXX: 'remove' is not in (guile)
|
||||||
|
|
Loading…
Reference in a new issue