summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2023-05-20 15:41:07 +0200
committerLudovic Courtès <ludo@gnu.org>2023-05-21 01:04:39 +0200
commit896a51258aa71a483d8f6be29169098de5967baa (patch)
treeb9a8af02865af88b14648b426833d7257cde7f67
parentd0168e1895f95eb69f47f799706167afe6976fa6 (diff)
downloadguix-patches-896a51258aa71a483d8f6be29169098de5967baa.tar
guix-patches-896a51258aa71a483d8f6be29169098de5967baa.tar.gz
services: Transient inetd services inherit requirements.
That way, per-connection transient services such as 'sshd-123' inherit dependencies of their "parent" ('sshd' in this example), which is more consistent than not depending on anything. * gnu/services/dict.scm (dicod-shepherd-service): Pass #:requirements to 'make-inetd-constructor'. * gnu/services/messaging.scm (bitlbee-shepherd-service): Likewise. * gnu/services/ssh.scm (openssh-shepherd-service): Likewise. * gnu/services/vnc.scm (xvnc-shepherd-service): Likewise.
-rw-r--r--gnu/services/dict.scm1
-rw-r--r--gnu/services/messaging.scm1
-rw-r--r--gnu/services/ssh.scm3
-rw-r--r--gnu/services/vnc.scm1
4 files changed, 5 insertions, 1 deletions
diff --git a/gnu/services/dict.scm b/gnu/services/dict.scm
index 28add4b06a..90d3c35b6c 100644
--- a/gnu/services/dict.scm
+++ b/gnu/services/dict.scm
@@ -176,6 +176,7 @@ database {
(addrinfo:addr
(car (getaddrinfo #$(first interfaces)
"dict")))))
+ #:requirements '#$requirement
#:user "dicod" #:group "dicod"
#:service-name-stem "dicod")
(make-forkexec-constructor
diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm
index 3a48cd81f6..c4963936a0 100644
--- a/gnu/services/messaging.scm
+++ b/gnu/services/messaging.scm
@@ -872,6 +872,7 @@ string, you could instantiate a prosody service like this:
#$(number->string port)
(logior AI_NUMERICHOST
AI_NUMERICSERV))))))
+ #:requirements '#$requirement
#:service-name-stem "bitlbee"
#:user "bitlbee" #:group "bitlbee"
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index 303beed9ff..0abecd6b42 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014-2019, 2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014-2019, 2022, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
@@ -607,6 +607,7 @@ of user-name/file-like tuples."
(make-socket-address AF_INET6 IN6ADDR_ANY
#$port-number)))
'()))
+ #:requirements '#$requirement
#:max-connections #$max-connections)
(make-forkexec-constructor #$openssh-command
#:pid-file #$pid-file)))
diff --git a/gnu/services/vnc.scm b/gnu/services/vnc.scm
index d57cf51af2..f90bd7258f 100644
--- a/gnu/services/vnc.scm
+++ b/gnu/services/vnc.scm
@@ -228,6 +228,7 @@ CONFIG, a <xvnc-configuration> object."
,@(if ipv6-socket
(list (endpoint ipv6-socket))
'()))
+ #:requirements '#$requirement
#:user "xvnc"
#:group "xvnc"))
#~(make-forkexec-constructor