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 ms9.migadu.com with LMTPS id SGMUBCGTGGTkxgAASxT56A (envelope-from ) for ; Mon, 20 Mar 2023 18:08:49 +0100 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 QO0ZBCGTGGSJPAEAauVa8A (envelope-from ) for ; Mon, 20 Mar 2023 18:08:49 +0100 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 BB10914777 for ; Mon, 20 Mar 2023 18:08:48 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peIzP-0002hG-Oi; Mon, 20 Mar 2023 13:08:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peIzM-0002dS-Oa for guix-patches@gnu.org; Mon, 20 Mar 2023 13:08:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peIzM-0005pU-G4 for guix-patches@gnu.org; Mon, 20 Mar 2023 13:08:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peIzM-00031M-Aj for guix-patches@gnu.org; Mon, 20 Mar 2023 13:08:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62298] [PATCH 8/8] services: mympd: Use user-account (resp. user-group) for user (resp. group) fields. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:08:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62298 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62298@debbugs.gnu.org Cc: ludo@gnu.org, Bruno Victal , liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 62298-submit@debbugs.gnu.org id=B62298.167933205511535 (code B ref 62298); Mon, 20 Mar 2023 17:08:04 +0000 Received: (at 62298) by debbugs.gnu.org; 20 Mar 2023 17:07:35 +0000 Received: from localhost ([127.0.0.1]:55647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peIyt-0002zt-9J for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:07:35 -0400 Received: from smtpmciv1.myservices.hosting ([185.26.107.237]:43378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peIyh-0002z1-MU for 62298@debbugs.gnu.org; Mon, 20 Mar 2023 13:07:28 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv1.myservices.hosting (Postfix) with ESMTP id DDE30209F4; Mon, 20 Mar 2023 18:07:19 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id AD18A8009D; Mon, 20 Mar 2023 18:07:19 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id oIeK0MeG4TvO; Mon, 20 Mar 2023 18:07:19 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id BE6C58009B; Mon, 20 Mar 2023 18:07:18 +0100 (CET) From: Bruno Victal Date: Mon, 20 Mar 2023 17:07:13 +0000 Message-Id: <48b9090890e5a03710bccaa9b48967c3db5560fd.1679332019.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679332128; a=rsa-sha256; cv=none; b=CfCkZCi8IksVnT7vvysFzSunBlgaGHJz+B6RfIkW6DIjkXqR72uZJTqZ0ugqnawbBN4VB3 4GJfGUF+bjqO3WBX0mBNAbvNCDjfUROM9tCsO8gaKkFiBIAw5LG2BkHKNmbszQiSq7YXOz 8pldQdcwX8TrG2ACIsvH5+REIk2MJE+D62AMfL3Q7J1BgYeK+2+/Jgwhmuwu4kovbNSK6C SYk1ILt6uuXHYdDaI1IzR1qaMIkL8yGj18QzwqKOQEaWQ5CZi4PQeIR5GIF9uUTvKNGd9W zHjsY5Ty3Nu5Cse3/L3CeJI5nLdK4APWdpCFN4YI/HTvUaLF8O4y59yj7UjVbw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679332128; 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; bh=rxSLuV+0J5cQyEMfmlJuCfseN6tNxcMcLVmqDd0WYO8=; b=YjpSQKfU8BHxtIZW93medn0OONoSNWHzRJWdcvVbplnQiTnK68Quk2/xUxRvatzPPZwnxm biWOLwCZSIQX8uFeDDLO/NhVDlylU8uP7Ovv+dfD57BJs8aDC22E3h43uh1sGYocM7wm+z SMB0x5t3JqRzXbPMBCv1Qaqgr7lmhChzjBRRqw1I+8eVx3Y39G25YCkwylM6Ft4K9WKJ1O T7i4zwWZnbJIgqxmUiwmcGZOeaZXzfGBYJ59h2MDf78U56j2vOqxaGeF8PfFfOdGyTO+Bs yLn+/Uk57YCd7Kka1ajiTHqYHwweDjgDZzMS/yFRF1gHZxM6lEb3csP3orauZw== X-Migadu-Spam-Score: -0.26 X-Spam-Score: -0.26 X-Migadu-Queue-Id: BB10914777 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; 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-Scanner: scn1.migadu.com X-TUID: +IXqF8Z5TxHn * gnu/services/audio.scm (%mympd-user, %mympd-group): New variable. (mympd-user-sanitizer, mympd-group-sanitizer): New procedure. (mympd-configuration)[user, group]: Set value type to user-account (resp. user-group). (mympd-serialize-configuration): Adapt for user-account values in user field. (mympd-accounts): Adapt for user-account (resp. user-group) in user (resp. group) field. --- doc/guix.texi | 4 +-- gnu/services/audio.scm | 63 +++++++++++++++++++++++++++++++++--------- 2 files changed, 52 insertions(+), 15 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ecc520397c..7c7e45ec8e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -33705,10 +33705,10 @@ Audio Services This is a list of symbols naming Shepherd services that this service will depend on. -@item @code{user} (default: @code{"mympd"}) (type: string) +@item @code{user} (type: maybe-user-account) Owner of the @command{mympd} process. -@item @code{group} (default: @code{"nogroup"}) (type: string) +@item @code{group} (type: maybe-user-group) Owner group of the @command{mympd} process. @item @code{work-directory} (default: @code{"/var/lib/mympd"}) (type: string) diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm index eaee9b1536..9211cbcc52 100644 --- a/gnu/services/audio.scm +++ b/gnu/services/audio.scm @@ -640,6 +640,47 @@ (define-configuration/no-serialization mympd-ip-acl (define-maybe/no-serialization integer) (define-maybe/no-serialization mympd-ip-acl) +;; XXX: These will shadow the previous definition used by mpd +;; and cause warnings to be shown. Maybe split the file +;; into audio/mpd.scm and audio/mympd.scm ? +#;(define-maybe/no-serialization user-account) +#;(define-maybe/no-serialization user-group) + +(define %mympd-user + (user-account + (name "mympd") + (group "mympd") + (system? #t) + (comment "myMPD user") + (home-directory "/var/empty") + (shell (file-append shadow "/sbin/nologin")))) + +(define %mympd-group + (user-group + (name "mympd") + (system? #t))) + +;;; TODO: procedures for unsupported value types, to be removed. +(define (mympd-user-sanitizer value) + (cond ((user-account? value) value) + ((string? value) + (warning (G_ "string value for 'user' is not supported, use \ +user-account instead. Ignoring this value~%")) + %mympd-user) + (else + (leave (G_ "'~a' is not a valid value for 'user'~%") value)))) + +(define (mympd-group-sanitizer value) + (cond ((user-group? value) value) + ((string? value) + (warning (G_ "string value for 'group' is not supported, use \ +user-group instead. Ignoring this value~%")) + %mympd-group) + (else + (leave (G_ "'~a' is not a valid value for 'group'~%") value)))) +;;; + + ;; XXX: The serialization procedures are insufficient since we require ;; access to multiple fields at once. ;; Fields marked with empty-serializer are never serialized and are @@ -657,13 +698,15 @@ (define-configuration/no-serialization mympd-configuration empty-serializer) (user - (string "mympd") + (maybe-user-account %mympd-user) "Owner of the @command{mympd} process." + (sanitizer mympd-user-sanitizer) empty-serializer) (group - (string "nogroup") + (maybe-user-group %mympd-group) "Owner group of the @command{mympd} process." + (sanitizer mympd-group-sanitizer) empty-serializer) (work-directory @@ -798,7 +841,8 @@ (define (mympd-shepherd-service config) (match-record config (package shepherd-requirement user work-directory cache-directory log-level log-to) - (let ((log-level* (format #f "MYMPD_LOGLEVEL=~a" log-level))) + (let ((log-level* (format #f "MYMPD_LOGLEVEL=~a" log-level)) + (username (user-account-name user))) (shepherd-service (documentation "Run the myMPD daemon.") (requirement `(loopback user-processes @@ -806,7 +850,7 @@ (define (mympd-shepherd-service config) ,@shepherd-requirement)) (provision '(mympd)) (start #~(begin - (let* ((pw (getpwnam #$user)) + (let* ((pw (getpwnam #$username)) (uid (passwd:uid pw)) (gid (passwd:gid pw))) (for-each (lambda (dir) @@ -816,7 +860,7 @@ (define (mympd-shepherd-service config) (make-forkexec-constructor `(#$(file-append package "/bin/mympd") - "--user" #$user + "--user" #$username #$@(if (eqv? log-to 'syslog) '("--syslog") '()) "--workdir" #$work-directory "--cachedir" #$cache-directory) @@ -826,14 +870,7 @@ (define (mympd-shepherd-service config) (define (mympd-accounts config) (match-record config (user group) - (list (user-group (name group) - (system? #t)) - (user-account (name user) - (group group) - (system? #t) - (comment "myMPD user") - (home-directory "/var/empty") - (shell (file-append shadow "/sbin/nologin")))))) + (list user group))) (define (mympd-log-rotation config) (match-record config (log-to) -- 2.39.1