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 ms9.migadu.com with LMTPS id WAZ9C79VTWRuFAAASxT56A (envelope-from ) for ; Sat, 29 Apr 2023 19:37:03 +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 eBpdC79VTWSHcQAA9RJhRA (envelope-from ) for ; Sat, 29 Apr 2023 19:37:03 +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 D4276EB01 for ; Sat, 29 Apr 2023 19:37:02 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psoHo-00013R-Fg; Sat, 29 Apr 2023 13:23:04 -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 1psoHn-00013A-Mc for bug-guix@gnu.org; Sat, 29 Apr 2023 13:23: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 1psoHn-0003MW-DF for bug-guix@gnu.org; Sat, 29 Apr 2023 13:23:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1psoHn-00007G-7J for bug-guix@gnu.org; Sat, 29 Apr 2023 13:23:03 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#63082: [PATCH v2 02/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: Sat, 29 Apr 2023 17:23: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.168278893832676 (code B ref 63082); Sat, 29 Apr 2023 17:23:03 +0000 Received: (at 63082) by debbugs.gnu.org; 29 Apr 2023 17:22:18 +0000 Received: from localhost ([127.0.0.1]:36552 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psoH3-0008Uv-G7 for submit@debbugs.gnu.org; Sat, 29 Apr 2023 13:22:17 -0400 Received: from mail-qt1-f178.google.com ([209.85.160.178]:59537) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psoGu-0008TU-LG for 63082@debbugs.gnu.org; Sat, 29 Apr 2023 13:22:09 -0400 Received: by mail-qt1-f178.google.com with SMTP id d75a77b69052e-3ef6e84945dso4845931cf.2 for <63082@debbugs.gnu.org>; Sat, 29 Apr 2023 10:22:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682788923; x=1685380923; 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=qm+sVrHNmXp2tLOa3MpKMvBfptCrE0MYI8Ui3UJ9pzzygypfBLFiOGc4U5i0lx7xXO YKyFA9GHOfJj1E031cT+frZvCMGFpR4BP3aMkktSv2m5sgEArvGWIZRjCwcCb4qUyxlg wheFaDe+3z0SBp8Vo6eL+NcnJvjIuGzOjxURodtqd/roNtk4VzyM/EHMD0DmG1OdlNTu QMtdg4kF+yKG2B0gJ7hVWTK4AndFg1xYRsrT/7TfWQgSmLG5Jsag5Gpxy+xZV/SzhaB7 wZI8uqjDopyZD0zANlgS+ETB3W7kHzQyYnQlcGMzwwpvxv8lQ/1F7A6qrJrs/6xFD4HC u8+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682788923; x=1685380923; 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=PuhWkRmWnafj4DSye/PDzKEvS9sUpNuh/eV0qeqO8B778vCNGsAoEucMGND2dR6AS/ UrzuWcg/hCfsGUxpxk/nOhyhRW7kG08xPWHOngkuziiYQHUy9jv6vDTPL81707RLGJEi sl8WBlB1CchyZTeKnRn9R7RKRFgCqKNW0HagexJ6OZ6U7v4/CZVnb5AK/9WbIwIZFXwH V0Rned7huVPAwvTzLWkK1oUj8oRYuAPo2QZwQG3EeZkVQ1rB2MuQRast2CTJ5QsXqMo3 Asi7rskkmRa4Wm24pfzCrF9v1yAp0e7j3bfmUEItRon7xsLb+dmG7Qsd2rgXfbFt+Lta XGFA== X-Gm-Message-State: AC+VfDz0uT36WaqYlIjkW0TyaXx6uHyDA6qeFlokJ5eSpd7Ti9+wGcBT Kt4MgD8ZS1ZL48id+WQXV917LGBINX4= X-Google-Smtp-Source: ACHHUZ40XV+ftLUeIS9bxaCNcOSyxEFi94OoOAMKkaaQirEwI/UKhFZwj/qpMZ8btHsOMhEPxqENRA== X-Received: by 2002:ac8:5886:0:b0:3ef:2ce7:7f5f with SMTP id t6-20020ac85886000000b003ef2ce77f5fmr14426324qta.18.1682788922962; Sat, 29 Apr 2023 10:22:02 -0700 (PDT) Received: from localhost.localdomain (dsl-155-245.b2b2c.ca. [66.158.155.245]) by smtp.gmail.com with ESMTPSA id dm45-20020a05620a1d6d00b0074cf009f443sm7582489qkb.85.2023.04.29.10.22.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 10:22:02 -0700 (PDT) From: Maxim Cournoyer Date: Sat, 29 Apr 2023 13:21:39 -0400 Message-Id: <15db5c777d50d410cc898dba62bfd21fdecdb60d.1682788743.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-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1682789823; a=rsa-sha256; cv=none; b=JG/evJ2xO60hGLpQleFScZgcivFe0uxY9KiOrmAl11ko7h7SSliPaiZz04wuV9d+gcbg1A WF6rXM21UQjuLh/TTLlZPekwIZ9pKSAsvJd8zqQrnlnZ5/knySeJ+RGx40P6Zjpc7yHonS nxm0ZQlsdQY5Kw0uY3jNvBk280xyLh4jpnd8JELSt8MTsa1TiCIL+cvn2lgLu6WmF80mHW axxhu+tvr1/5Vn6c1RyLMr7y7HaNLpyhWt59tKNtlXFrMgCECyk1RP3Mb5KNvZ8nwAolMi 5RixLi0BMJVUtJV7RFUVa0PNSMI0Kw/MDG4+WonLqh+aOBncc1AYmoBAUwpVJQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=qm+sVrHN; 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=1682789823; 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=HhgAGs0hVf9vwAbZX4WDfNleSGLMswFHOUSim2/LFQ9MHEz6JKI5zyeT2CHMJ6qvwcOXqg 2T1JJX1gDvOM2qA1iezZI0ByOcZX2T41WPsxlBW6xFsmfQisvMusprRfydwn54I3uzBgLr 5MbmR+WC22n/rOeFJ93ELlcdfXb0nCf/8RybpVBQ6jFfG8zru0SlV+3Ez5o9Of/VQ3nCTa 7YI/1Zsu7vFMUC1Ie44XpL5rSUjO73mEgxntelGxGPl9FF0uhq1CxIm6kbHoxYkLmvh7d+ 1jr5YBAv2ztUKQqoT13VG7UquRVloKnvj2lF9UI6ma8m2S3VZiT22W4nBeX2VA== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=qm+sVrHN; 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-Migadu-Spam-Score: 7.30 X-Spam-Score: 7.30 X-Migadu-Queue-Id: D4276EB01 X-TUID: gfZpgBHScZrc * 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