From patchwork Sat Apr 23 14:25:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 38770 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2862A27BBEA; Sat, 23 Apr 2022 18:07:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, PP_MIME_FAKE_ASCII_TEXT,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9D90227BBE9 for ; Sat, 23 Apr 2022 18:07:12 +0100 (BST) Received: from localhost ([::1]:42268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1niJDz-0005Rx-O2 for patchwork@mira.cbaines.net; Sat, 23 Apr 2022 13:07:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1niJDr-0005QF-85 for guix-patches@gnu.org; Sat, 23 Apr 2022 13:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35017) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1niJDq-0008VT-Ty for guix-patches@gnu.org; Sat, 23 Apr 2022 13:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1niJDq-00074e-Po for guix-patches@gnu.org; Sat, 23 Apr 2022 13:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54986] [PATCH v2 2/3 WIP] services: shepherd: Add support for socket activation endpoints. References: <9d4cc9d3ebb05d2aabf8f06e1890efe9b0b9a849.camel@gmail.com> In-Reply-To: <9d4cc9d3ebb05d2aabf8f06e1890efe9b0b9a849.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Apr 2022 17:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54986 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54986@debbugs.gnu.org Cc: ludo@gnu.org Received: via spool by 54986-submit@debbugs.gnu.org id=B54986.165073360927153 (code B ref 54986); Sat, 23 Apr 2022 17:07:02 +0000 Received: (at 54986) by debbugs.gnu.org; 23 Apr 2022 17:06:49 +0000 Received: from localhost ([127.0.0.1]:57143 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1niJDd-00073n-04 for submit@debbugs.gnu.org; Sat, 23 Apr 2022 13:06:49 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:42576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1niJDZ-000737-4t for 54986@debbugs.gnu.org; Sat, 23 Apr 2022 13:06:45 -0400 Received: by mail-ej1-f67.google.com with SMTP id i27so21913264ejd.9 for <54986@debbugs.gnu.org>; Sat, 23 Apr 2022 10:06:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:cc:content-transfer-encoding:message-id :mime-version; bh=seEX2LEgzCZY4UiCqrYu/PjKLIwGvoXWcSeGOBa8kjQ=; b=LQapge+1rJWCtnqHF8/oLxQv75/bMT6hl5l/iEvbj8VRTlajj1qHr/Tu5oYT64/BgP JK1UqYW1mBgRBbm/rLN+IjO2sCVD6bfIV4l/JEuQUZeEU8b54OHW64bxik5T8EeBtWom HzXTi64C8ScZpxRmKyASKHzBRtZ2N+GdBVZHiid73ktqTnazYaYqPY2J4CKjSNqskm17 4misr7sl70Y+QhnV3u3Mq/xsD/2FamSQQ8mOVhNzFEnOD2X6gZxB4ZRr+HWlbHyNIfRk r+cPj7HpIeEFtGT28PoCFjGYZDwTbQ1Ieeyn2g/4iKPIFQOu2Tg5u2Tcub2glfkOoodA hf4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:cc :content-transfer-encoding:message-id:mime-version; bh=seEX2LEgzCZY4UiCqrYu/PjKLIwGvoXWcSeGOBa8kjQ=; b=d9cxxzLYt20H1OBj5x6QzimeEMuzujp86MeSdOtMZuXzXNf7iToazlYIL7qll21ca8 GGyXOy3Mh67cLF0JpjtH37H/v51wl7lSOtVIQ6/aX6NiH6nZnex9fr4Qpi1X/N5JoWtB ChwIeKHxRVpy3fjWqMjPIO16V1OJpM7u8vfcwlPLBhib6bH+q9eM/tWtiZ3J2EUhWmyT IwrkYJKXM/SSqj8D0x5/MS6DiehApewlY7ksVTRVm8uLq/bnYkGXWXLAwbH8LeNEIjF/ QRK/CTQM0XNKEdT+1XRovExQGY9sgUn1/buPu26W2zmAqCyJB/66QN1dtmRKKdz//k7T uvRg== X-Gm-Message-State: AOAM532D7RO12i4IlMtUP3uKPxN8KD50OemqhxnzHtE6Zg38Y+da6Y93 iGzjO3zdBIUVjiTJeMxuWhGYhAFZbTk= X-Google-Smtp-Source: ABdhPJw4ku37MuenuJK1wlUwmGCI3oTCm+TZWQ3bCvaFtQCy0eNAKINVK3ThZQknTsMAR09XE9r7wg== X-Received: by 2002:a17:907:62a6:b0:6ef:8118:d3e2 with SMTP id nd38-20020a17090762a600b006ef8118d3e2mr8850358ejc.605.1650733599436; Sat, 23 Apr 2022 10:06:39 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id b7-20020a170906708700b006da8440d642sm1855481ejk.113.2022.04.23.10.06.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Apr 2022 10:06:39 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 23 Apr 2022 16:25:55 +0200 Message-ID: <454555484d434cefead47968e938ea071fe6121a.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/services/shepherd.scm (): 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 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 + (($ 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 make-shepherd-service shepherd-service?