diff options
author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-12-18 03:58:23 +0100 |
---|---|---|
committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-12-18 03:58:23 +0100 |
commit | 256d5b3598fa2162e9712fc98781d2cb4ceda31e (patch) | |
tree | 0e7f7051a59aad879561b5c4ee885e24d3c04bc6 /gnu/services/web.scm | |
parent | 9f6210cc5c114310a38ad1cc0ff5900409a7e7cc (diff) | |
parent | 1a9f267f51f97b8ca7049aa72763ddd64aad5b62 (diff) |
Merge branch 'master' into wip-webkitwip-webkit
Diffstat (limited to 'gnu/services/web.scm')
-rw-r--r-- | gnu/services/web.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 9fd2a3f742..55cc095d90 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -1229,8 +1229,9 @@ a webserver.") (frequency 'weekly)))) (define (hpcguix-web-shepherd-service config) - (let ((specs (hpcguix-web-configuration-specs config)) - (hpcguix-web (hpcguix-web-package config))) + (let* ((specs (hpcguix-web-configuration-specs config)) + (config-file (and specs (scheme-file "hpcguix-web.scm" specs))) + (hpcguix-web (hpcguix-web-package config))) (with-imported-modules (source-module-closure '((gnu build shepherd))) (shepherd-service @@ -1246,9 +1247,7 @@ a webserver.") #$(number->string (hpcguix-web-configuration-port config)) #$@(if specs - #~((string-append "--config=" - #$(scheme-file - "hpcguix-web.scm" specs))) + #~((string-append "--config=" #$config-file)) #~())) #:user "hpcguix-web" #:group "hpcguix-web" @@ -1256,7 +1255,8 @@ a webserver.") (list "XDG_CACHE_HOME=/var/cache/guix/web" "SSL_CERT_DIR=/etc/ssl/certs") #:log-file #$%hpcguix-web-log-file)) - (stop #~(make-kill-destructor)))))) + (stop #~(make-kill-destructor)) + (actions (list (shepherd-configuration-action config-file))))))) (define hpcguix-web-service-type (service-type |