From 5ba7e828ad27d5c3d84e85d4277bbfeccca33270 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 28 Jan 2021 16:06:19 +0100 Subject: [PATCH] services: cuirass: Create remote-server cache directory. * gnu/services/cuirass.scm (cuirass-activation): Create remote-server cache directory if needed. Signed-off-by: Mathieu Othacehe --- gnu/services/cuirass.scm | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index ea6f771849..2d0bf47b48 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -243,11 +243,16 @@ (define (cuirass-postgresql-role config) (define (cuirass-activation config) "Return the activation code for CONFIG." - (let ((cache (cuirass-configuration-cache-directory config)) - (db (dirname (cuirass-configuration-database config))) - (user (cuirass-configuration-user config)) - (log "/var/log/cuirass") - (group (cuirass-configuration-group config))) + (let* ((cache (cuirass-configuration-cache-directory config)) + (remote-server (cuirass-configuration-remote-server config)) + (remote-cache (and remote-server + (cuirass-remote-server-configuration-cache + remote-server))) + (db (dirname + (cuirass-configuration-database config))) + (user (cuirass-configuration-user config)) + (log "/var/log/cuirass") + (group (cuirass-configuration-group config))) (with-imported-modules '((guix build utils)) #~(begin (use-modules (guix build utils)) @@ -256,11 +261,17 @@ (define (cuirass-activation config) (mkdir-p #$db) (mkdir-p #$log) + (when #$remote-cache + (mkdir-p #$remote-cache)) + (let ((uid (passwd:uid (getpw #$user))) (gid (group:gid (getgr #$group)))) (chown #$cache uid gid) (chown #$db uid gid) - (chown #$log uid gid)))))) + (chown #$log uid gid) + + (when #$remote-cache + (chown #$remote-cache uid gid))))))) (define (cuirass-log-rotations config) "Return the list of log rotations that corresponds to CONFIG."