aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Isaac2023-01-31 00:00:40 +0000
committerArun Isaac2023-01-31 00:00:40 +0000
commitee70d6c70b458781bd43c6355637b42a9f9e838d (patch)
treef03bcd8eb6bd680f3d7aa47e107c78209df4f0e6
parenta9b38775e51d61caa1a585ce31f1a9b62308afb1 (diff)
downloadguix-forge-ee70d6c70b458781bd43c6355637b42a9f9e838d.tar.gz
guix-forge-ee70d6c70b458781bd43c6355637b42a9f9e838d.tar.lz
guix-forge-ee70d6c70b458781bd43c6355637b42a9f9e838d.zip
tissue: Conditionally embed socket directory creation G-expression.
Prior to this, when an IP socket was used, we would be running forge-unix-socket-path on it and thus erroring out. * guix/forge/tissue.scm (tissue-activation): Do not embed the socket directory creation G-expression unless the socket is a Unix socket.
-rw-r--r--guix/forge/tissue.scm10
1 files changed, 5 insertions, 5 deletions
diff --git a/guix/forge/tissue.scm b/guix/forge/tissue.scm
index ea7c594..07687e8 100644
--- a/guix/forge/tissue.scm
+++ b/guix/forge/tissue.scm
@@ -235,11 +235,11 @@ available both as a command-line program and as a web server.")
(ice-9 match))
(let ((user (getpw "tissue")))
- ;; Create socket directory.
- (when #$(forge-unix-socket? socket)
- (let ((socket-directory #$(dirname (forge-unix-socket-path socket))))
- (mkdir-p socket-directory)
- (chown socket-directory (passwd:uid user) (passwd:gid user))))
+ ;; Create socket directory if Unix socket.
+ #$(and (forge-unix-socket? socket)
+ #~(let ((socket-directory #$(dirname (forge-unix-socket-path socket))))
+ (mkdir-p socket-directory)
+ (chown socket-directory (passwd:uid user) (passwd:gid user))))
;; Create state directory.
(mkdir-p #$state-directory)
(chown #$state-directory (passwd:uid user) (passwd:gid user)))