From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 2P0HHcGBXGLvTgEAgWs5BA (envelope-from ) for ; Sun, 17 Apr 2022 23:08:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 4DtHGsGBXGJTfQAA9RJhRA (envelope-from ) for ; Sun, 17 Apr 2022 23:08:17 +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 083682864C for ; Sun, 17 Apr 2022 23:08:17 +0200 (CEST) Received: from localhost ([::1]:42240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ngC80-0000cX-2x for larch@yhetil.org; Sun, 17 Apr 2022 17:08:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ngC5u-0006K8-E7 for guix-patches@gnu.org; Sun, 17 Apr 2022 17:06:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43551) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ngC5t-0000Ye-Mv for guix-patches@gnu.org; Sun, 17 Apr 2022 17:06:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ngC5t-00026r-HH for guix-patches@gnu.org; Sun, 17 Apr 2022 17:06:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54997] [PATCH 11/12] services: wesnothd: Use 'least-authority-wrapper'. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Apr 2022 21:06: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.16502295598015 (code B ref 54997); Sun, 17 Apr 2022 21:06:05 +0000 Received: (at 54997) by debbugs.gnu.org; 17 Apr 2022 21:05:59 +0000 Received: from localhost ([127.0.0.1]:37434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ngC5m-000256-Qb for submit@debbugs.gnu.org; Sun, 17 Apr 2022 17:05:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ngC5d-00022d-0q for 54997@debbugs.gnu.org; Sun, 17 Apr 2022 17:05:50 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:58446) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ngC5X-0000Wa-S9; Sun, 17 Apr 2022 17:05:43 -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=Fs0Td2FhdDbA9Zx7+m4bcoGIq+I66Pyd3wX+b3zcZ+U=; b=Zxiy7ny65kDPR3uo1MJY 1is8khz9xxQxFXMw7kOJzMDd/R1HmbXLI69p931Qb8d4I8kp2NejPCcb4r75+U83J6hxH2W2of/li erR3IveDxkYRTQcLe1QhakR2IjPcCPSsWJBzFt8K8SWsQ9IR4CCrhCSpc6+IL9Qs1OVeFduBQk6Mi CED5xKcg7+QXBgwR2gQDf3NJoXBQN3oeZLuwumm0o/S+DLG6i+DxJMqIHD8F+mYXpIgPE03JpHTpl 7Ct7schbd/Vzpg8RrzZGfOoW3JggL12PY2n+QJ7qysCK2nHU7eVz8Ph62166LyqZn6ascytaw6EgY 2PYmWLNH+6mZjA==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=38870 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 1ngC5X-000268-Fk; Sun, 17 Apr 2022 17:05:43 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sun, 17 Apr 2022 23:04:52 +0200 Message-Id: <20220417210453.27884-11-ludo@gnu.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220417210453.27884-1-ludo@gnu.org> References: <20220417210453.27884-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=1650229697; 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=Fs0Td2FhdDbA9Zx7+m4bcoGIq+I66Pyd3wX+b3zcZ+U=; b=FqfiKxl0jWSYcD2qpAdlsRzdsLQqzlk0+PU4agJDgk3eomgqJ803NgafE8csxtuNli3ClD Tsr5sLHenfmwOMB2GzUb8BsxUFR21160KX4fq8FQKKNiwv6V0Jnv1FB8KD6boKBVMb2PBH oq4JiTrqnJzkMSBziqBZPVD0XIqYUAfRmAGgLGPBimL+dvTP3VMntrKdT8t8i73UdtqLbT wI/jFbWMKR+lE98YTkqaVIhjm/TDcW4nsYWAO3JCHLvEk3nLpjXWP441IzwrmeD1jWgC0/ o1lcDR9VxU5Q4UQiUyneKDgFPLsoHQ6Fm10iuY/GL4bz5tqyh/+hCXWneaHQdw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1650229697; a=rsa-sha256; cv=none; b=DCewVrDoT45zHar5KYXuHnZThfVoP2Vy659qRbBVwo/9MfIGVmlK1/lyDDWXgm/b72LSn3 6+2rVdj4RHO3el87i2/y0XM4kysdffYISW1tTTMC0WOiURXi71cLGLHDKN3G5Qga8jGYsw gxcoCv1fXggYs1XBWr+fGs58W4eIh1zpz/AozV2NYi+y3HkxhSaLtWKraX17nGPcE2Z1D8 3/9jyWQ4amKhXqbQGLdUcD5TbfTN+HN9RB0mimCoI2y4+qVwMBSFCVuyz7nlWypr23QY0n vpRlLiTQfeG+KaM2IMmbIBciJ3upOYmmX7tmQIFNgc3ZMupXL+1iqSRKZz7irw== 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=Zxiy7ny6; 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: -0.94 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Zxiy7ny6; 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: 083682864C X-Spam-Score: -0.94 X-Migadu-Scanner: scn1.migadu.com X-TUID: 3a0qPi8ssA5m * gnu/services/games.scm (wesnothd-shepherd-service): Use 'least-authority-wrapper' instead of 'make-forkexec-constructor/container'. --- gnu/services/games.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/services/games.scm b/gnu/services/games.scm index dc0bfbe9dc..6c2af44b49 100644 --- a/gnu/services/games.scm +++ b/gnu/services/games.scm @@ -23,6 +23,9 @@ (define-module (gnu services games) #:use-module (gnu packages admin) #:use-module (gnu packages games) #:use-module (gnu system shadow) + #:use-module ((gnu system file-systems) #:select (file-system-mapping)) + #:use-module (gnu build linux-container) + #:autoload (guix least-authority) (least-authority-wrapper) #:use-module (guix gexp) #:use-module (guix modules) #:use-module (guix records) @@ -57,22 +60,20 @@ (define %wesnothd-accounts (define wesnothd-shepherd-service (match-lambda (($ package port) - (with-imported-modules (source-module-closure - '((gnu build shepherd) - (gnu system file-systems))) + (let ((wesnothd (least-authority-wrapper + (file-append package "/bin/wesnothd") + #:name "wesnothd" + #:mappings (list (file-system-mapping + (source "/var/run/wesnothd") + (target source) + (writable? #t))) + #:namespaces (delq 'net %namespaces)))) (shepherd-service (documentation "The Battle for Wesnoth server") (provision '(wesnoth-daemon)) (requirement '(networking)) - (modules '((gnu build shepherd) - (gnu system file-systems))) - (start #~(make-forkexec-constructor/container - (list #$(file-append package "/bin/wesnothd") - "-p" #$(number->string port)) - #:mappings (list (file-system-mapping - (source "/var/run/wesnothd") - (target source) - (writable? #t))) + (start #~(make-forkexec-constructor + (list #$wesnothd "-p" #$(number->string port)) #:user "wesnothd" #:group "wesnothd")) (stop #~(make-kill-destructor))))))) -- 2.35.1