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 gK4bKSPxS2S5YQEASxT56A (envelope-from ) for ; Fri, 28 Apr 2023 18:15:31 +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 RMzTKCPxS2S++QAAauVa8A (envelope-from ) for ; Fri, 28 Apr 2023 18:15:31 +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 4FF4F19639 for ; Fri, 28 Apr 2023 18:15:31 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psP5G-00086V-Ms; Fri, 28 Apr 2023 10:28:26 -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 1psP4t-0007WX-6D for bug-guix@gnu.org; Fri, 28 Apr 2023 10:28:03 -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 1psP4s-0005xB-Mc for bug-guix@gnu.org; Fri, 28 Apr 2023 10:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1psP4s-000589-Hq for bug-guix@gnu.org; Fri, 28 Apr 2023 10:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#63082: [PATCH 02/17] 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, 28 Apr 2023 14:28:02 +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.168269205019512 (code B ref 63082); Fri, 28 Apr 2023 14:28:02 +0000 Received: (at 63082) by debbugs.gnu.org; 28 Apr 2023 14:27:30 +0000 Received: from localhost ([127.0.0.1]:34122 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psP4L-00054T-LJ for submit@debbugs.gnu.org; Fri, 28 Apr 2023 10:27:30 -0400 Received: from mail-qv1-f52.google.com ([209.85.219.52]:56538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psP4K-00053u-DD for 63082@debbugs.gnu.org; Fri, 28 Apr 2023 10:27:28 -0400 Received: by mail-qv1-f52.google.com with SMTP id 6a1803df08f44-5ef420b51adso300636d6.0 for <63082@debbugs.gnu.org>; Fri, 28 Apr 2023 07:27:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682692043; x=1685284043; 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=ErNOFoq1fN7b4oY8kR+tB1Qn4uHgImswfk6B8wVXb0W87BXNQ3QbKbJMNoaKSGM/9b LMUNSfjA6R4pkM2Vod6BGl7O9Nrl3i5sv4biNcq3qzc8XdgYIAuFdSOizDse5V5wlLzu R50uDKi31xFnV9yVKf7bNpazZNyZcrsTkpkubIj8Tcweavx0ucy8X44u7FK9Vtth3NGl KErBVfzm2dvYnMfRiL2XShvctzpr5KDOWQjHs1go1SMm6JJX09jmwP2YlDAF3sq/I4Ie DuCa6Ybi1aW3UOfexcBXL/4JkXgae/weXua6xah/rKrHMZpRlaH9OpqNDOaQbc1tELlT 0KxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682692043; x=1685284043; 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=HdKWOsS3cQK6L03N2d39C0dMig+sDVCSKD93TJxoLuT1AzbDGGkvn8wp8PkmIAcOjA va7Q09RyAM2cjC83F2NnhG5ou666XkaiYTBR4CzZkt6rUQ5liQqcY6Pb855hCevmRfGI NUbEhACR1A8F48cs4pDVuSBlSo0CKkAhiHhwm3LWlkiY37ICEO7hVgwvCJ7F0qWpinA6 I+K/Hn1KN47ysxajMEhKDRGoAY5dh5yv122okHptnIHnWbSjzxCq/mnzKlfMEdHFYbu6 eYtuITxjKSYZKLTdtlTWkhjCOZ5mJYJbMoZCy8hM8u9gMh55YBFlpyI2GG5SdcO061cz /6iA== X-Gm-Message-State: AC+VfDz97YqG1RlGKvkc68ivLPde3685TBxkZken9/yQoL+J3BldYjY7 wQ09FZzAul6IKoF3iNdSNvwBGDVy86w= X-Google-Smtp-Source: ACHHUZ75nT/VgXQ5iQrxE0MWkNYgxHZQpqfpuVR0ZdCAe+y1a3W+Z/87cjlh7Wa0AnBjOpV8vFyzLw== X-Received: by 2002:a05:6214:212d:b0:5e7:f7eb:d87 with SMTP id r13-20020a056214212d00b005e7f7eb0d87mr8680557qvc.47.1682692042769; Fri, 28 Apr 2023 07:27:22 -0700 (PDT) Received: from localhost.localdomain ([2607:fad8:4:3::1000]) by smtp.gmail.com with ESMTPSA id d8-20020a0cfe88000000b005ff569bca72sm6176940qvs.93.2023.04.28.07.27.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Apr 2023 07:27:22 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 28 Apr 2023 10:26:55 -0400 Message-Id: <15db5c777d50d410cc898dba62bfd21fdecdb60d.1682690696.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=1682698531; a=rsa-sha256; cv=none; b=nD4I/6NYjKX7oztVOcu3rf22W4oR2chv7N7m0QzObO1kIDdw3ZS+1QL+FCbGQDK5XLuLvs da+U5sd19+xRVP6cR10lp5MS+ZBMiipMAROQPK19KFHOfkMhnrEq4qC8Ph2cX3QxvKrW5S d24GgYbElQ513O+Qx79PQHiNVlYOHhnw1Uv6qFBjERyZv+UgkgO7AJJDV1K2TUOU+qdYfX Zw0/4lGOOrzO93sjtlnab/hIeSRTVIMbCFpuM5XkVrqDelegYouGwMaCwFilMCIK7J7Jwe T4IhiMuPGo5VZEvz+sISRy9Tl3hZg/weDuzNAtqDQBEMlI6C2HXzmPXfgfdzAw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=ErNOFoq1; 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=1682698531; 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=oq6InYzSrBp7M0lG7J0Il4P3FzXBcDkSyLClj7vB2cJv0HsVwdVJPhAej1hTOUGYQ/GXX9 +Ftkqgp0rwC0cG5CU3KT9KxTA9aRjebYu6wfBjw/Nc/MuMfJ5ZltfQ79UN1WzhDZEHke3n HBM/OnJuUHdRcMkR6cZavfq8Sgepspp1KGGNYqDjk592YSrohG1j8gXGlidrLTJsyqmiui TUA1LEq9ThqQAQ2LrG4rIrH3Gu8jLO9Ysfd3YhDeAhGj2rQpEfO0E1Z5mWnWy7IGp6xyal 2/cGwRfU8OXYDMm2/1hN6ujxZxGpEZkVlHo1EkljXI+bJDoYqZPfqmWKvG3yLQ== X-Migadu-Spam-Score: -1.81 X-Spam-Score: -1.81 X-Migadu-Queue-Id: 4FF4F19639 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=ErNOFoq1; 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: wdaAn9E21ggr * 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