summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2021-04-23 13:38:49 +0100
committerChristopher Baines <mail@cbaines.net>2021-04-23 13:38:49 +0100
commit51201d636acf04b070af49b8f5ca1b2e755ca42b (patch)
treedce6e6e4c072e30c571cb44f08c015ed9ea7c3b0 /gnu
parent69634ad70b25670b37e42045b86753f1f8048b0f (diff)
downloadguix-51201d636acf04b070af49b8f5ca1b2e755ca42b.tar.gz
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.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/services/guix.scm12
1 files 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 @@
   #~(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 @@
   #~(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 @@
   #~(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