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
parent
62a08abea7
commit
3d6583727e
|
|
@ -512,28 +512,25 @@ created after the PostgreSQL database is started.")))
|
|||
(match-lambda
|
||||
(($ <memcached-configuration> memcached interfaces tcp-port udp-port
|
||||
additional-options)
|
||||
(with-imported-modules (source-module-closure
|
||||
'((gnu build shepherd)))
|
||||
(list (shepherd-service
|
||||
(provision '(memcached))
|
||||
(documentation "Run the Memcached daemon.")
|
||||
(requirement '(user-processes loopback))
|
||||
(modules '((gnu build shepherd)))
|
||||
(start #~(make-forkexec-constructor
|
||||
`(#$(file-append memcached "/bin/memcached")
|
||||
"-l" #$(string-join interfaces ",")
|
||||
"-p" #$(number->string tcp-port)
|
||||
"-U" #$(number->string udp-port)
|
||||
"--daemon"
|
||||
;; Memcached changes to the memcached user prior to
|
||||
;; writing the pid file, so write it to a directory
|
||||
;; that memcached owns.
|
||||
"-P" "/var/run/memcached/pid"
|
||||
"-u" "memcached"
|
||||
,#$@additional-options)
|
||||
#:log-file "/var/log/memcached"
|
||||
#:pid-file "/var/run/memcached/pid"))
|
||||
(stop #~(make-kill-destructor))))))))
|
||||
(list (shepherd-service
|
||||
(provision '(memcached))
|
||||
(documentation "Run the Memcached daemon.")
|
||||
(requirement '(user-processes loopback))
|
||||
(start #~(make-forkexec-constructor
|
||||
`(#$(file-append memcached "/bin/memcached")
|
||||
"-l" #$(string-join interfaces ",")
|
||||
"-p" #$(number->string tcp-port)
|
||||
"-U" #$(number->string udp-port)
|
||||
"--daemon"
|
||||
;; Memcached changes to the memcached user prior to
|
||||
;; writing the pid file, so write it to a directory
|
||||
;; that memcached owns.
|
||||
"-P" "/var/run/memcached/pid"
|
||||
"-u" "memcached"
|
||||
,#$@additional-options)
|
||||
#:log-file "/var/log/memcached"
|
||||
#:pid-file "/var/run/memcached/pid"))
|
||||
(stop #~(make-kill-destructor)))))))
|
||||
|
||||
(define memcached-service-type
|
||||
(service-type (name 'memcached)
|
||||
|
|
|
|||
|
|
@ -50,22 +50,19 @@
|
|||
(define pcscd-shepherd-service
|
||||
(match-lambda
|
||||
(($ <pcscd-configuration> pcsc-lite)
|
||||
(with-imported-modules (source-module-closure
|
||||
'((gnu build shepherd)))
|
||||
(shepherd-service
|
||||
(documentation "PC/SC Smart Card Daemon")
|
||||
(provision '(pcscd))
|
||||
(requirement '(syslogd))
|
||||
(modules '((gnu build shepherd)))
|
||||
(start #~(lambda _
|
||||
(let ((socket "/run/pcscd/pcscd.comm"))
|
||||
(when (file-exists? socket)
|
||||
(delete-file socket)))
|
||||
(fork+exec-command
|
||||
(list #$(file-append pcsc-lite "/sbin/pcscd")
|
||||
"--foreground")
|
||||
#:log-file "/var/log/pcscd.log")))
|
||||
(stop #~(make-kill-destructor)))))))
|
||||
(shepherd-service
|
||||
(documentation "PC/SC Smart Card Daemon")
|
||||
(provision '(pcscd))
|
||||
(requirement '(syslogd))
|
||||
(start #~(lambda _
|
||||
(let ((socket "/run/pcscd/pcscd.comm"))
|
||||
(when (file-exists? socket)
|
||||
(delete-file socket)))
|
||||
(fork+exec-command
|
||||
(list #$(file-append pcsc-lite "/sbin/pcscd")
|
||||
"--foreground")
|
||||
#:log-file "/var/log/pcscd.log")))
|
||||
(stop #~(make-kill-destructor))))))
|
||||
|
||||
(define pcscd-activation
|
||||
(match-lambda
|
||||
|
|
|
|||
|
|
@ -1232,31 +1232,29 @@ a webserver.")
|
|||
(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
|
||||
(documentation "hpcguix-web daemon")
|
||||
(provision '(hpcguix-web))
|
||||
(requirement '(networking))
|
||||
(start #~(make-forkexec-constructor
|
||||
(list #$(file-append hpcguix-web "/bin/hpcguix-web")
|
||||
(string-append "--listen="
|
||||
#$(hpcguix-web-configuration-address
|
||||
config))
|
||||
"-p"
|
||||
#$(number->string
|
||||
(hpcguix-web-configuration-port config))
|
||||
#$@(if specs
|
||||
#~((string-append "--config=" #$config-file))
|
||||
#~()))
|
||||
#:user "hpcguix-web"
|
||||
#:group "hpcguix-web"
|
||||
#:environment-variables
|
||||
(list "XDG_CACHE_HOME=/var/cache/guix/web"
|
||||
"SSL_CERT_DIR=/etc/ssl/certs")
|
||||
#:log-file #$%hpcguix-web-log-file))
|
||||
(stop #~(make-kill-destructor))
|
||||
(actions (list (shepherd-configuration-action config-file)))))))
|
||||
(shepherd-service
|
||||
(documentation "hpcguix-web daemon")
|
||||
(provision '(hpcguix-web))
|
||||
(requirement '(networking))
|
||||
(start #~(make-forkexec-constructor
|
||||
(list #$(file-append hpcguix-web "/bin/hpcguix-web")
|
||||
(string-append "--listen="
|
||||
#$(hpcguix-web-configuration-address
|
||||
config))
|
||||
"-p"
|
||||
#$(number->string
|
||||
(hpcguix-web-configuration-port config))
|
||||
#$@(if specs
|
||||
#~((string-append "--config=" #$config-file))
|
||||
#~()))
|
||||
#:user "hpcguix-web"
|
||||
#:group "hpcguix-web"
|
||||
#:environment-variables
|
||||
(list "XDG_CACHE_HOME=/var/cache/guix/web"
|
||||
"SSL_CERT_DIR=/etc/ssl/certs")
|
||||
#:log-file #$%hpcguix-web-log-file))
|
||||
(stop #~(make-kill-destructor))
|
||||
(actions (list (shepherd-configuration-action config-file))))))
|
||||
|
||||
(define hpcguix-web-service-type
|
||||
(service-type
|
||||
|
|
|
|||
Reference in New Issue