From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id cAW6IJJLVWQ6FAAASxT56A (envelope-from ) for ; Fri, 05 May 2023 20:31:46 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id qP9zIJJLVWSQAgEAauVa8A (envelope-from ) for ; Fri, 05 May 2023 20:31:46 +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 4C5C62CC04 for ; Fri, 5 May 2023 20:31:46 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pv0C0-0005Da-IY; Fri, 05 May 2023 14:30:08 -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 1pv0Bv-0005BF-U3 for bug-guix@gnu.org; Fri, 05 May 2023 14:30:07 -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 1pv0Bv-0005zE-Fv for bug-guix@gnu.org; Fri, 05 May 2023 14:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pv0Bv-0003AY-9b for bug-guix@gnu.org; Fri, 05 May 2023 14:30:03 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#63082: [PATCH v3 03/16] services: mpd: Streamline mpd-user-sanitizer and mympd-user-sanitizer. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 05 May 2023 18:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63082 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 63082@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 63082-submit@debbugs.gnu.org id=B63082.168331137711933 (code B ref 63082); Fri, 05 May 2023 18:30:03 +0000 Received: (at 63082) by debbugs.gnu.org; 5 May 2023 18:29:37 +0000 Received: from localhost ([127.0.0.1]:57474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pv0BU-00036H-IK for submit@debbugs.gnu.org; Fri, 05 May 2023 14:29:36 -0400 Received: from mail-qk1-f180.google.com ([209.85.222.180]:47424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pv0BS-00035P-AP for 63082@debbugs.gnu.org; Fri, 05 May 2023 14:29:34 -0400 Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-74fbf99adc2so101670185a.3 for <63082@debbugs.gnu.org>; Fri, 05 May 2023 11:29:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683311368; x=1685903368; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=E907hWJp1Rcb9drxhnCJiM7IicvT0X0UX/hd/jgk/vk=; b=ZFvaOI9mIDCKIpzR+/P7qF+Fr6IMAUf52X9QD4XNZrrETeaLbLa04pGVHF9HILEQtw x5uF72PociC1vgvLTbsWJb7/gYnC+6nZG0sz5UbAHTtAkAaonKL+E8Pm+kQv+XuYAhvb ukYj0VTTCVg+oV6ozLkDMpCirgQlY7WLj2GxyjYWf98jCuXnwCY/aU/lMBG74ambCZl8 rKhO2qvo6JV2RKyhIQSAy4WyKM4C1JDiIxPLl3zswiobPvIy6icz/c4vzgG+6bWTT+Db bnGZU1RsWaejmlWlSA+OrqnjbfufVmLL0stTWAYWtFpQfX+0CFtELHi1n9DS5vMhDKB+ OPkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683311368; x=1685903368; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E907hWJp1Rcb9drxhnCJiM7IicvT0X0UX/hd/jgk/vk=; b=AiPg5scoRZypRAlZnje5iE82bOzZoWlJv1EubnO6IYp9scqKvKVqdTrxy6R8vmfZs1 VhSc0CVC3M6+/XXsnLTvHNcT5GG2wq1d8+bwityG9/wXLvfvrsnpJjWu7qpTvOA4l8In 9inS9ZbYZHGRTPCWiSix7VJ8Sf+fYU4zE9N9Jnk0UVWrfAkDK+aoVktdFmcfBF0fhYJS RrNdS+ej+YMuSnopke/EOefs8UTaVUcdEuO8/+vrzqRx1YKY5Z7gLjgLS+oKQ0yhveLQ CpgMj5AzxdfioSdkhntIOc0DKj/hEKqURloIp7pS2juDEyAzmQFgGoyA0jZHVZ4aqQVX sAow== X-Gm-Message-State: AC+VfDymedjbiUI78n9+/TIZGEMBzwobVgGVc99forEzUN7rUftin4TY Qpe6EVBzJhXD3Odeqjhu7EjTb9QISEw= X-Google-Smtp-Source: ACHHUZ5d2Kyb3HfyH3jiJ2wHnWSN+KuaY6XsObDhw9oWOpY0gJxbxP0sOxcxUfWLzOdoSmAZzTHVHg== X-Received: by 2002:ac8:5711:0:b0:3f2:1ee8:9805 with SMTP id 17-20020ac85711000000b003f21ee89805mr4545508qtw.7.1683311368643; Fri, 05 May 2023 11:29:28 -0700 (PDT) Received: from localhost.localdomain (dsl-205-236-230-162.b2b2c.ca. [205.236.230.162]) by smtp.gmail.com with ESMTPSA id c1-20020ac81e81000000b003e97fe68511sm834399qtm.3.2023.05.05.11.29.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 11:29:28 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 5 May 2023 14:28:58 -0400 Message-Id: <13ac0212f8011cb9fdf7d3ccc56170a3600e3b4a.1683299529.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: 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: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-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=1683311506; a=rsa-sha256; cv=none; b=hQFMPtYVRCa/KEG0WWMMxUITgjaHv+fwV9lLAA8iwB3i7zfa8FBvkUG74GOdnqtSBZ2vZZ l62i6f4bQZQszrkMqMuZJr0hVFIPn1IeYLlenEI3tJUZMSoIWgOfSi0iA4NfodkNqApQhj G4cB7azMsCa2enHGp2u/ec+4ECuJ9AzuRiOyaqgsDeTJFsatsVLXzeXU+Xa1OpAd0Ysx/W S7DuuqorZo1+mFK6bZmOggJ9rVpCmsPd/68Ke2D6odtQNXULFNNDUST8Hsht1gq4eJxp+V uG9j3fAZAK7M6Yez6XIWzbFH+Tv9bhurz6Q2lj9qXWdZiaDfzpOWnF44xl6Gtg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=ZFvaOI9m; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1683311506; 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=E907hWJp1Rcb9drxhnCJiM7IicvT0X0UX/hd/jgk/vk=; b=MYrixF51w93GdYTYIB8Tjwn6ccBSxG8NJg7ORneQrUNfnFX7MFyTEt19R/imU5JPBWWnNT 2kN4Gcgj6ZQjUw0OcXMb2iCm06rM+cPUdWRrJKxe1eZwgjtSLHMxZ0OZTuFcGzeUKvUv2i gxiRQZ56cTIKeOeqgNfpI0uXuCdgK7AhRdc9IKSBiFVtFXULgVzmvdCJlqKvSPxGjhN8v7 zgI8RKZvBCitrdhkNHhUHFQeMBJ4Jjzs+sAPDBipMEsadan7ghhkGuigIbKF6l6/b2PWBa MUImEu7oIiDzZaDz0CKSLzuRRqG0kpzP+3L7DPYZVvJ7lE1hkpRq/7fjHvFtDQ== X-Migadu-Spam-Score: -3.20 X-Spam-Score: -3.20 X-Migadu-Queue-Id: 4C5C62CC04 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=ZFvaOI9m; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-TUID: eOSN7ZKAQi/K * gnu/services/audio.scm (mpd-user-sanitizer, %mympd-user): Remove extraneous group field, already inherited. (%mpd-user, %mympd-user): Clarify %lazy-group explanatory comment. Fix indentation. --- gnu/services/audio.scm | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm index 6e4ce3f9fb..dc83479e40 100644 --- a/gnu/services/audio.scm +++ b/gnu/services/audio.scm @@ -184,13 +184,15 @@ (define-maybe boolean (prefix mpd-)) (define %mpd-user (user-account - (name "mpd") - (group %lazy-group) - (system? #t) - (comment "Music Player Daemon (MPD) user") - ;; MPD can use $HOME (or $XDG_CONFIG_HOME) to place its data - (home-directory "/var/lib/mpd") - (shell (file-append shadow "/sbin/nologin")))) + (name "mpd") + ;; XXX: This is a place-holder to be lazily substituted in (…-accounts) + ;; with the value from the 'group' field of . + (group %lazy-group) + (system? #t) + (comment "Music Player Daemon (MPD) user") + ;; MPD can use $HOME (or $XDG_CONFIG_HOME) to place its data. + (home-directory "/var/lib/mpd") + (shell (file-append shadow "/sbin/nologin")))) (define %mpd-group (user-group @@ -235,10 +237,7 @@ (define (mpd-user-sanitizer value) user-account instead~%")) (user-account (inherit %mpd-user) - (name value) - ;; XXX: This is to be lazily substituted in (…-accounts) - ;; with the value from 'group'. - (group %lazy-group))) + (name value))) (else (configuration-field-error #f 'user value)))) @@ -676,12 +675,14 @@ (define-maybe/no-serialization mympd-ip-acl) (define %mympd-user (user-account - (name "mympd") - (group %lazy-group) - (system? #t) - (comment "myMPD user") - (home-directory "/var/empty") - (shell (file-append shadow "/sbin/nologin")))) + (name "mympd") + ;; XXX: This is a place-holder to be lazily substituted in 'mympd-accounts' + ;; with the value from the 'group' field of . + (group %lazy-group) + (system? #t) + (comment "myMPD user") + (home-directory "/var/empty") + (shell (file-append shadow "/sbin/nologin")))) (define %mympd-group (user-group @@ -696,10 +697,7 @@ (define (mympd-user-sanitizer value) user-account instead~%")) (user-account (inherit %mympd-user) - (name value) - ;; XXX: this is to be lazily substituted in (…-accounts) - ;; with the value from 'group'. - (group %lazy-group))) + (name value))) (else (configuration-field-error #f 'user value)))) -- 2.39.2