From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 CIWZLot2aWKLSAAAbAwnHQ (envelope-from ) for ; Wed, 27 Apr 2022 18:59:55 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id sITTLot2aWLqewAA9RJhRA (envelope-from ) for ; Wed, 27 Apr 2022 18:59:55 +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 4FAA7AC67 for ; Wed, 27 Apr 2022 18:59:55 +0200 (CEST) Received: from localhost ([::1]:59090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njl18-000779-Dj for larch@yhetil.org; Wed, 27 Apr 2022 12:59:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njkzO-0004TV-HA for guix-patches@gnu.org; Wed, 27 Apr 2022 12:58:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50273) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njkzO-0005Cr-7A for guix-patches@gnu.org; Wed, 27 Apr 2022 12:58:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1njkzO-0003uE-6z for guix-patches@gnu.org; Wed, 27 Apr 2022 12:58:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54997] [PATCH v2 07/15] services: dicod: Rewrite using 'least-authority-wrapper'. 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:06 +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.165107864714846 (code B ref 54997); Wed, 27 Apr 2022 16:58:06 +0000 Received: (at 54997) by debbugs.gnu.org; 27 Apr 2022 16:57:27 +0000 Received: from localhost ([127.0.0.1]:44147 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1njkyl-0003rI-FQ for submit@debbugs.gnu.org; Wed, 27 Apr 2022 12:57:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1njkyM-0003oG-9K for 54997@debbugs.gnu.org; Wed, 27 Apr 2022 12:57:04 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60014) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njkyD-00053T-61; 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=C/R40NJJCuw3AQnu9NbuQVkDnge+l5uFaKySskrcw5Q=; b=bmHIymvuojKW8WQiSTl2 OJET/guKDR2HbZixwfAHQtqIElfXRKr+VHgY2YamLSp0RKpK2iiS6VLgjyoTjEtYcgTNrd7SGsTMi In/gX2vJmOuAuWtO77mtB6PyvqEVdMymtDDWIhz0Oyo3OsF3O4VNfpg0TqD3sXWSUT2w2hUSoxPb0 Ec1hiaMcC3EBHsgIFUvKraza+QSMIhbgMYk5ENRA1p6SOMAobV6dweFEg5HFJA+5kKaRZpFCUzGXd xC1KFm74YIHPThpgZNsnOPFA2syWRGajEgLuTaRRKJHRfAbujJGeWn2hY0Lr6sCOGxhZ27Mh/SDSk rhJ29kixQSQZJA==; 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 1njkyC-0000Hl-QQ; Wed, 27 Apr 2022 12:56:53 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Wed, 27 Apr 2022 18:56:27 +0200 Message-Id: <20220427165635.8015-8-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-Type: text/plain; charset=UTF-8 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=1651078795; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=C/R40NJJCuw3AQnu9NbuQVkDnge+l5uFaKySskrcw5Q=; b=Zl4aVn5z6WwBguwDWYk8lmnp1h5FV8WKX1bfJurJASSe5T31gQTZgbU1oq7FIUI2Vh2haZ 00v2m8NAFkM+SpiAhrVJm8H+TmA/FiIqPGRLEaBYg2YuoHvgfRVqEjpstk80VgeJ4z1cfr A+JS4dmSWfFCd/WQgeLEjytnJ5Spl9GFkNQsmJUi/cMTxjzHMIyKPbayh4QsZTX4EiLJwQ APzAJBtkVxbh65o79isMdsvs7WnuHeSwrAulZdlJ//JjGiouN/QZ8WNM9A4GhNdK+BVv3w uzlsvwhzB0ChtJKFn0JzAkcQtl/CQMuaulKjLRcxpw2gmwNMIHD8tQ/5lUYZFw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1651078795; a=rsa-sha256; cv=none; b=ni38ijT7PkGIglliXqSzszFM5cBiEWGy6KKY6CE5aQHPBc15+fwKm/2MSeKPV8tRZS+fG+ w61dyIc4Yj+m6R86L6W+06DCQW9zIhogAAwoEQikq9U8uBzgRssRfU6JkvZSpJVuSIXUL7 3RdlyK6fSFc5JPBWFPrbybcVkUSbSx71mibIbWHLTkY8q3KxzLkLCFn/ycvHPQL6hWaPK3 7lJDcYJM9t+EZR8SpWK2l0KL8gh31y3K8TqNaSHjndL1jnJVeETa72Jgi4+GjvsYza0QKf Hix6WGhM6cNoS16NTb6CMnd4Y3lkS8Yo9M8g2ZfcFwNf8tkonYyeVHE2Hmbzjg== 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=bmHIymvu; 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.90 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=bmHIymvu; 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: 4FAA7AC67 X-Spam-Score: -2.90 X-Migadu-Scanner: scn1.migadu.com X-TUID: Oo/ffNPMYRGD * gnu/services/dict.scm (dicod-shepherd-service): Rewrite using 'least-authority-wrapper' plus 'make-forkexec-constructor' instead of 'make-forkexec-constructor/container'. --- gnu/services/dict.scm | 51 ++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/gnu/services/dict.scm b/gnu/services/dict.scm index a97ad8f608..62b21f8d53 100644 --- a/gnu/services/dict.scm +++ b/gnu/services/dict.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Sou Bunnbu -;;; Copyright © 2016, 2017, 2018, 2020 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018, 2020, 2022 Ludovic Courtès ;;; Copyright © 2017 Huang Ying ;;; ;;; This file is part of GNU Guix. @@ -22,12 +22,15 @@ (define-module (gnu services dict) #:use-module (guix gexp) #:use-module (guix records) #:use-module (guix modules) + #:use-module (guix least-authority) #:use-module (gnu services) #:use-module (gnu services shepherd) #:use-module (gnu system shadow) #:use-module ((gnu packages admin) #:select (shadow)) #:use-module (gnu packages dico) #:use-module (gnu packages dictionaries) + #:autoload (gnu build linux-container) (%namespaces) + #:autoload (gnu system file-systems) (file-system-mapping) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (ice-9 match) @@ -142,27 +145,31 @@ (define %dicod-activation (chown rundir (passwd:uid user) (passwd:gid user))))) (define (dicod-shepherd-service config) - (let ((dicod (file-append (dicod-configuration-dico config) - "/bin/dicod")) - (dicod.conf (dicod-configuration-file config))) - (with-imported-modules (source-module-closure - '((gnu build shepherd) - (gnu system file-systems))) - (list (shepherd-service - (provision '(dicod)) - (requirement '(user-processes)) - (documentation "Run the dicod daemon.") - (modules '((gnu build shepherd) - (gnu system file-systems))) - (start #~(make-forkexec-constructor/container - (list #$dicod "--foreground" - (string-append "--config=" #$dicod.conf)) - #:user "dicod" #:group "dicod" - #:mappings (list (file-system-mapping - (source "/var/run/dicod") - (target source) - (writable? #t))))) - (stop #~(make-kill-destructor))))))) + (let* ((dicod.conf (dicod-configuration-file config)) + (dicod (least-authority-wrapper + (file-append (dicod-configuration-dico config) + "/bin/dicod") + #:name "dicod" + #:mappings (list (file-system-mapping + (source "/var/run/dicod") + (target source) + (writable? #t)) + (file-system-mapping + (source "/dev/log") + (target source)) + (file-system-mapping + (source dicod.conf) + (target source))) + #:namespaces (delq 'net %namespaces)))) + (list (shepherd-service + (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")) + (stop #~(make-kill-destructor)))))) (define dicod-service-type (service-type -- 2.35.1