[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/04: services: mpd: Streamline mpd-user-sanitizer and mympd-user-sanit
From: |
guix-commits |
Subject: |
03/04: services: mpd: Streamline mpd-user-sanitizer and mympd-user-sanitizer. |
Date: |
Tue, 25 Jul 2023 17:06:07 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 42c8a2e296ebaa98fe9bb04c0e59abfe7c5431de
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Apr 26 19:44:51 2023 -0400
services: mpd: Streamline mpd-user-sanitizer and mympd-user-sanitizer.
* 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 %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 <mpd-configuration>.
+ (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 @@
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 @@ MPD (PID ~a)." pid))
(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 <mympd-configuration>.
+ (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 @@ MPD (PID ~a)." pid))
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))))