me
/
guix
Archived
1
0
Fork 0
Code

services: Remove unnecessary references to (gnu build shepherd). 

* gnu/services/databases.scm (memcached-shepherd-service): Remove
‘with-imported-modules’ form and ‘modules’ field.
* gnu/services/security-token.scm (pcscd-shepherd-service): Remove
‘with-imported-modules’ form.
* gnu/services/web.scm (hpcguix-web-shepherd-service): Likewise.

Change-Id: Ieb817508f1751e0c1ff551a0e078789a4a813c1c
Ludovic Courtès 2023-11-14 11:48:50 +01:00
parent 62a08abea7
commit 3d6583727e
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 55 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gnu/services/databases.scm
View File

@ -512,28 +512,25 @@ created after the PostgreSQL database is started.")))
(match-lambda (match-lambda
(($ <memcached-configuration> memcached interfaces tcp-port udp-port (($ <memcached-configuration> memcached interfaces tcp-port udp-port
additional-options) additional-options)
(with-imported-modules (source-module-closure (list (shepherd-service
'((gnu build shepherd))) (provision '(memcached))
(list (shepherd-service (documentation "Run the Memcached daemon.")
(provision '(memcached)) (requirement '(user-processes loopback))
(documentation "Run the Memcached daemon.") (start #~(make-forkexec-constructor
(requirement '(user-processes loopback)) `(#$(file-append memcached "/bin/memcached")
(modules '((gnu build shepherd))) "-l" #$(string-join interfaces ",")
(start #~(make-forkexec-constructor "-p" #$(number->string tcp-port)
`(#$(file-append memcached "/bin/memcached") "-U" #$(number->string udp-port)
"-l" #$(string-join interfaces ",") "--daemon"
"-p" #$(number->string tcp-port) ;; Memcached changes to the memcached user prior to
"-U" #$(number->string udp-port) ;; writing the pid file, so write it to a directory
"--daemon" ;; that memcached owns.
;; Memcached changes to the memcached user prior to "-P" "/var/run/memcached/pid"
;; writing the pid file, so write it to a directory "-u" "memcached"
;; that memcached owns. ,#$@additional-options)
"-P" "/var/run/memcached/pid" #:log-file "/var/log/memcached"
"-u" "memcached" #:pid-file "/var/run/memcached/pid"))
,#$@additional-options) (stop #~(make-kill-destructor)))))))
#:log-file "/var/log/memcached"
#:pid-file "/var/run/memcached/pid"))
(stop #~(make-kill-destructor))))))))
(define memcached-service-type (define memcached-service-type
(service-type (name 'memcached) (service-type (name 'memcached)

29
gnu/services/security-token.scm
View File

@ -50,22 +50,19 @@
(define pcscd-shepherd-service (define pcscd-shepherd-service
(match-lambda (match-lambda
(($ <pcscd-configuration> pcsc-lite) (($ <pcscd-configuration> pcsc-lite)
(with-imported-modules (source-module-closure (shepherd-service
'((gnu build shepherd))) (documentation "PC/SC Smart Card Daemon")
(shepherd-service (provision '(pcscd))
(documentation "PC/SC Smart Card Daemon") (requirement '(syslogd))
(provision '(pcscd)) (start #~(lambda _
(requirement '(syslogd)) (let ((socket "/run/pcscd/pcscd.comm"))
(modules '((gnu build shepherd))) (when (file-exists? socket)
(start #~(lambda _ (delete-file socket)))
(let ((socket "/run/pcscd/pcscd.comm")) (fork+exec-command
(when (file-exists? socket) (list #$(file-append pcsc-lite "/sbin/pcscd")
(delete-file socket))) "--foreground")
(fork+exec-command #:log-file "/var/log/pcscd.log")))
(list #$(file-append pcsc-lite "/sbin/pcscd") (stop #~(make-kill-destructor))))))
"--foreground")
#:log-file "/var/log/pcscd.log")))
(stop #~(make-kill-destructor)))))))
(define pcscd-activation (define pcscd-activation
(match-lambda (match-lambda

48
gnu/services/web.scm
View File

@ -1232,31 +1232,29 @@ a webserver.")
(let* ((specs (hpcguix-web-configuration-specs config)) (let* ((specs (hpcguix-web-configuration-specs config))
(config-file (and specs (scheme-file "hpcguix-web.scm" specs))) (config-file (and specs (scheme-file "hpcguix-web.scm" specs)))
(hpcguix-web (hpcguix-web-package config))) (hpcguix-web (hpcguix-web-package config)))
(with-imported-modules (source-module-closure (shepherd-service
'((gnu build shepherd))) (documentation "hpcguix-web daemon")
(shepherd-service (provision '(hpcguix-web))
(documentation "hpcguix-web daemon") (requirement '(networking))
(provision '(hpcguix-web)) (start #~(make-forkexec-constructor
(requirement '(networking)) (list #$(file-append hpcguix-web "/bin/hpcguix-web")
(start #~(make-forkexec-constructor (string-append "--listen="
(list #$(file-append hpcguix-web "/bin/hpcguix-web") #$(hpcguix-web-configuration-address
(string-append "--listen=" config))
#$(hpcguix-web-configuration-address "-p"
config)) #$(number->string
"-p" (hpcguix-web-configuration-port config))
#$(number->string #$@(if specs
(hpcguix-web-configuration-port config)) #~((string-append "--config=" #$config-file))
#$@(if specs #~()))
#~((string-append "--config=" #$config-file)) #:user "hpcguix-web"
#~())) #:group "hpcguix-web"
#:user "hpcguix-web" #:environment-variables
#:group "hpcguix-web" (list "XDG_CACHE_HOME=/var/cache/guix/web"
#:environment-variables "SSL_CERT_DIR=/etc/ssl/certs")
(list "XDG_CACHE_HOME=/var/cache/guix/web" #:log-file #$%hpcguix-web-log-file))
"SSL_CERT_DIR=/etc/ssl/certs") (stop #~(make-kill-destructor))
#:log-file #$%hpcguix-web-log-file)) (actions (list (shepherd-configuration-action config-file))))))
(stop #~(make-kill-destructor))
(actions (list (shepherd-configuration-action config-file)))))))
(define hpcguix-web-service-type (define hpcguix-web-service-type
(service-type (service-type