From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id gF9oDeF2aWKmcwEAbAwnHQ (envelope-from ) for ; Wed, 27 Apr 2022 19:01:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id UFmUDeF2aWKLcgAAauVa8A (envelope-from ) for ; Wed, 27 Apr 2022 19:01:21 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B2475AEB2 for ; Wed, 27 Apr 2022 19:01:20 +0200 (CEST) Received: from localhost ([::1]:33564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njl2V-0000fP-SQ for larch@yhetil.org; Wed, 27 Apr 2022 13:01:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njkzN-0004Qp-P4 for guix-patches@gnu.org; Wed, 27 Apr 2022 12:58:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50271) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njkzN-0005CU-EY for guix-patches@gnu.org; Wed, 27 Apr 2022 12:58:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1njkzN-0003tz-EE for guix-patches@gnu.org; Wed, 27 Apr 2022 12:58:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54997] [PATCH v2 08/15] services: dicod: Use 'make-inetd-constructor'. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Apr 2022 16:58:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54997 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54997@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 54997-submit@debbugs.gnu.org id=B54997.165107864714831 (code B ref 54997); Wed, 27 Apr 2022 16:58:05 +0000 Received: (at 54997) by debbugs.gnu.org; 27 Apr 2022 16:57:27 +0000 Received: from localhost ([127.0.0.1]:44143 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1njkyk-0003r3-Ks for submit@debbugs.gnu.org; Wed, 27 Apr 2022 12:57:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1njkyM-0003oC-8w for 54997@debbugs.gnu.org; Wed, 27 Apr 2022 12:57:03 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60016) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njkyD-00053U-OJ; Wed, 27 Apr 2022 12:56:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=MQpPXdmT27Sc0jQcJN7CCKM6M2Rthov0aXprrffF8VE=; b=AWhfDRPaYFltgn7hq4ZO 61RRDWgGNC7OspGe6YFl8bVJokegxytw2op+0GMNqHjmdYRVuFGWMDJmtym/8HiONr0dBTlNP/2Ay g75J24IPH6nR7KrTdB0rHfP4CcSDTmDtz/6fp/U0h2NYz3ZYT/MEaVydtcjBetS5Kuo1CI4XqWpiA 1MYEq2GwVt1WqRY54Ymvem9vBuY3b6wABa1ys9jqtZ9psbmqThjNZ0OeNfZm60YgMNsX/1aDrrrQK 5Nx8/RVyJV9Gs18y2tlMex6jVpvkZixJndBEqFCbSrLuMbeY6niIfjGyPVcVxTuc2IOmoJeRAWvAR SRoWlndTT6O4Wg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:64439 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njkyD-0000Hl-C2; Wed, 27 Apr 2022 12:56:53 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Wed, 27 Apr 2022 18:56:28 +0200 Message-Id: <20220427165635.8015-9-ludo@gnu.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220427165635.8015-1-ludo@gnu.org> References: <878rrrk1v1.fsf_-_@gnu.org> <20220427165635.8015-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1651078880; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=MQpPXdmT27Sc0jQcJN7CCKM6M2Rthov0aXprrffF8VE=; b=Nk58rsfAypwsb4hqu76lu76M72ksPSfBEi5mfcrx19RAvdvha+JWHGZdXSZW5DVwn0Adja lFa0Gnc6PBrRQLTcN5oCvawexbGrqITL+Zqvl018KDMA+wElhTnZ452TUmDlNcJtUEiFS7 g2k6dAI3C4961REm8bl8YhbnqOCg05rG6nqWaDMQOf2DKORxo+nDc29PyUpLa2X5IuspUv YcxvHzK+s78ohS3iA5JXChfEhIumpilgnAkNQkBxvWLZsW4Lzb/vDqVT59CRr5xb/h3uzR TJr2u4/RaZVfOsGCylSbYWrz1kXeOvjDTSYbGjOeneA7mBNHbtp9mfNu5RMRvw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1651078880; a=rsa-sha256; cv=none; b=JXe81wANGZ14rVMGktOiCNOl9Y29RY95poGCHjM+h2zd7/xBuIydc2f/hDl5YgmzjFcWSn KXmQ1uEl4B6FyH+M+BNJmcwIa4DGhWcfPx5tBtJKntrgUh/u8oKlEhqpjIRQqdHnDUWSUx eRZ4cozqs4hBZSwvmqBb9/Vc2ifGezT5WaLmLqO1rorZNWsbId54H5Szezq5+W+5tN2L6Q Bog5mj28FUHW10pVpEWrQfJqA0WmId+mhmeoNpl4vORBHYeFbOIyzSqFDxx4jFVEo0oj89 ue8VvQZeBUCP7OoqCJMd4BL8B8B2t1cjg516CODm12o1jULJXYAwmrOTyplFQg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=AWhfDRPa; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.40 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=AWhfDRPa; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: B2475AEB2 X-Spam-Score: -2.40 X-Migadu-Scanner: scn1.migadu.com X-TUID: pSjKMzYISRu+ * gnu/services/dict.scm (dicod-shepherd-service): Use 'make-inetd-constructor' in the 'start' method when available. --- gnu/services/dict.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/gnu/services/dict.scm b/gnu/services/dict.scm index 62b21f8d53..109917c05c 100644 --- a/gnu/services/dict.scm +++ b/gnu/services/dict.scm @@ -146,6 +146,7 @@ (define %dicod-activation (define (dicod-shepherd-service config) (let* ((dicod.conf (dicod-configuration-file config)) + (interfaces (dicod-configuration-interfaces config)) (dicod (least-authority-wrapper (file-append (dicod-configuration-dico config) "/bin/dicod") @@ -165,10 +166,19 @@ (define (dicod-shepherd-service config) (provision '(dicod)) (requirement '(user-processes)) (documentation "Run the dicod daemon.") - (start #~(make-forkexec-constructor - (list #$dicod "--foreground" - (string-append "--config=" #$dicod.conf)) - #:user "dicod" #:group "dicod")) + (start #~(if (and (defined? 'make-inetd-constructor) + #$(= 1 (length interfaces))) ;XXX + (make-inetd-constructor + (list #$dicod "--inetd" "--foreground" + (string-append "--config=" #$dicod.conf)) + (addrinfo:addr + (car (getaddrinfo #$(first interfaces) "dict"))) + #:user "dicod" #:group "dicod" + #:service-name-stem "dicod") + (make-forkexec-constructor + (list #$dicod "--foreground" + (string-append "--config=" #$dicod.conf)) + #:user "dicod" #:group "dicod"))) (stop #~(make-kill-destructor)))))) (define dicod-service-type -- 2.35.1