[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#54986] [PATCH v2 2/3 WIP] services: shepherd: Add support for socke
From: |
Liliana Marie Prikler |
Subject: |
[bug#54986] [PATCH v2 2/3 WIP] services: shepherd: Add support for socket activation endpoints. |
Date: |
Sat, 23 Apr 2022 16:25:55 +0200 |
* gnu/services/shepherd.scm (<shepherd-endpoint>): New record type.
(shepherd-endpoint->sexp): New variable.
* doc/guix.texi (Shepherd Services): Document it.
---
doc/guix.texi | 29 +++++++++++++++++++
gnu/services/shepherd.scm | 60 +++++++++++++++++++++++++++++++++++++++
2 files changed, 89 insertions(+)
diff --git a/doc/guix.texi b/doc/guix.texi
index 5399584cb0..38aeda1d2d 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -37675,6 +37675,35 @@ This, as you can see, is a fairly sophisticated way to
say hello.
info on actions.
@end deftp
+@deftp {Data Type} shepherd-endpoint
+This is an endpoint that a systemd-style shepherd service listens on.
+
+@table @code
+@item address
+This is the socket address that shepherd binds and forwards to the service.
+
+@item name
+â¾\_(ã)_/â¾
+
+@item style
+â¾\_(ã)_/â¾
+
+@item backlog
+â¾\_(ã)_/â¾
+
+@item socket-owner
+This is the user ID owning the socket.
+
+@item socket-group
+This is the group ID owning the socket.
+
+@item socket-directory-permissions
+These are the UNIX permissions to set for the directory the socket
+resides in.
+
+@end table
+@end deftp
+
@defvr {Scheme Variable} shepherd-root-service-type
The service type for the Shepherd ``root service''---i.e., PID@tie{}1.
diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm
index 4fd4b2a497..3ef0023d7f 100644
--- a/gnu/services/shepherd.scm
+++ b/gnu/services/shepherd.scm
@@ -66,6 +66,16 @@ (define-module (gnu services shepherd)
shepherd-action-documentation
shepherd-action-procedure
+ shepherd-endpoint
+ shepherd-endpoint-address
+ shepherd-endpoint-name
+ shepherd-endpoint-style
+ shepherd-endpoint-backlog
+ shepherd-endpoint-socket-owner
+ shepherd-endpoint-socket-group
+ shepherd-endpoint-socket-directory-permissions
+ shepherd-endpoint->sexp
+
%default-modules
shepherd-service-file
@@ -183,6 +193,56 @@ (define %default-modules
((guix build utils) #:hide (delete))
(guix build syscalls)))
+(define-record-type* <shepherd-endpoint>
+ shepherd-endpoint make-shepherd-endpoint
+ shepherd-endpoint?
+ (address shepherd-endpoint-address) ; sockaddr
+ (name shepherd-endpoint-name ; string | #f
+ (default #f))
+ (style shepherd-endpoint-style ; int | #f
+ (default #f))
+ (backlog shepherd-endpoint-backlog ; int | #f
+ (default #f))
+ (socket-owner shepherd-endpoint-socket-owner ; uid | #f
+ (default #f))
+ (socket-group shepherd-endpoint-socket-group ; gid | #f
+ (default #f))
+ (socket-directory-permissions
+ shepherd-endpoint-socket-directory-permissions ; chmod pattern (int) | #f
+ (default #f)))
+
+(define (shepherd-endpoint->sexp endpoint)
+ (match endpoint
+ (($ <shepherd-endpoint> address
+ name style backlog socket-owner socket-group
+ socket-directory-permissions)
+ `(endpoint
+ ,(match (sockaddr:fam address)
+ ((? (cute = <> AF_INET) _)
+ `(make-socket-addr AF_INET
+ ,(sockaddr:addr address)
+ ,(sockaddr:port address)))
+ ((? (cute = <> AF_INET6) _)
+ `(make-socket-addr AF_INET6
+ ,(sockaddr:addr address)
+ ,(sockaddr:port address)
+ ,(sockaddr:flowinfo address)
+ ,(sockaddr:scopeid address)))
+ ((? (cute = <> AF_UNIX) _)
+ `(make-socket-addr AF_UNIX
+ ,(sockaddr:path address))))
+ ,@(fold
+ (match-lambda*
+ (((key value) seed)
+ (if value (cons* key value seed) seed)))
+ '()
+ `((#:name ,name)
+ (#:style ,style)
+ (#:backlog ,backlog)
+ (#:socket-owner ,socket-owner)
+ (#:socket-group ,socket-group)
+ (#:socket-directory-permissions
,socket-directory-permissions)))))))
+
(define-record-type* <shepherd-service>
shepherd-service make-shepherd-service
shepherd-service?
--
2.35.1
- [bug#54986] [PATCH] gnu: mpd: Add support for socket activation., (continued)
[bug#54986] [PATCH v2 1/3] gnu: mpd: Add support for socket activation., Liliana Marie Prikler, 2022/04/23
[bug#54986] [PATCH v2 3/3 WIP] services: mpd: Support socket activation., Liliana Marie Prikler, 2022/04/23
[bug#54986] [PATCH v2 2/3 WIP] services: shepherd: Add support for socket activation endpoints.,
Liliana Marie Prikler <=