From 51201d636acf04b070af49b8f5ca1b2e755ca42b Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 23 Apr 2021 13:38:49 +0100 Subject: [PATCH] services: guix-build-coordinator: Fix service activation parts. Don't hardcode usernames, as these are in the config. Also fix the %user being missing from the queue-builds service activation. * gnu/services/guix.scm (guix-build-coordinator-activation, guix-build-coordinator-agent-activation): Use config for the user name. (guix-build-coordinator-queue-builds-activation): Define %user. --- gnu/services/guix.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index 65f3007916..bf2e418d72 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -329,7 +329,9 @@ (define (guix-build-coordinator-activation config) #~(begin (use-modules (guix build utils)) - (define %user (getpw "guix-build-coordinator")) + (define %user + (getpw #$(guix-build-coordinator-configuration-user + config))) (chmod "/var/lib/guix-build-coordinator" #o755) @@ -438,7 +440,9 @@ (define (guix-build-coordinator-agent-activation config) #~(begin (use-modules (guix build utils)) - (define %user (getpw "guix-build-coordinator-agent")) + (define %user + (getpw #$(guix-build-coordinator-agent-configuration-user + config))) (mkdir-p "/var/log/guix-build-coordinator") @@ -514,6 +518,10 @@ (define (guix-build-coordinator-queue-builds-activation config) #~(begin (use-modules (guix build utils)) + (define %user + (getpw #$(guix-build-coordinator-queue-builds-configuration-user + config))) + (mkdir-p "/var/log/guix-build-coordinator") ;; Allow writing the PID file