@@ 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