ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: mpd: Streamline mpd-user-sanitizer and mympd-user-sanitizer.

Browse source 
* 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.
This commit is contained in:
Maxim Cournoyer 2023-04-26 19:44:51 -04:00
parent e1070ee160
commit 42c8a2e296
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
gnu/services/audio.scm
View file

@ -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 <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 @@ (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 <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 @@ (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))))