From ee70d6c70b458781bd43c6355637b42a9f9e838d Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 31 Jan 2023 00:00:40 +0000 Subject: 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. --- guix/forge/tissue.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'guix/forge') 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))) -- cgit v1.2.3