diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-11-16 23:14:48 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-11-17 06:49:51 -0500 |
| commit | 7ae4cfa5aa5b48afc454c392055231a953f5b6c4 (patch) | |
| tree | 0adedbb458324623d26996dd143ad475e501e00d | |
| parent | 238248aac98daa8d455fc0c2244ba3e0175cb8b7 (diff) | |
| download | guix-patches-7ae4cfa5aa5b48afc454c392055231a953f5b6c4.tar guix-patches-7ae4cfa5aa5b48afc454c392055231a953f5b6c4.tar.gz | |
services: Streamline or eliminate some match-lambda patterns.
These were spot while working on a fix for commit 543d971ed2 ("services:
configuration: Re-order generated record fields").
* gnu/services/web.scm (php-fpm-accounts): Remove extraneous trailing dummy
catchall patterns.
(agate-accounts): Access the configuration fields directly since there are
only two, which is less error-prone.
| -rw-r--r-- | gnu/services/web.scm | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 2023119037..f337c90077 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -987,7 +987,7 @@ and the back-end of a Web service."))) (define php-fpm-accounts (match-lambda - (($ <php-fpm-configuration> php socket user group socket-user socket-group _ _ _ _ _ _) + (($ <php-fpm-configuration> php socket user group socket-user socket-group) `(,@(if (equal? group "php-fpm") '() (list (user-group (name "php-fpm") (system? #t)))) @@ -2143,24 +2143,23 @@ root=/srv/gemini (stop #~(make-kill-destructor))))))) (define agate-accounts - (match-lambda - (($ <agate-configuration> _ _ _ _ _ - _ _ _ _ - _ user group _) - `(,@(if (equal? group "agate") - '() - (list (user-group (name "agate") (system? #t)))) - ,(user-group - (name group) - (system? #t)) - ,(user-account - (name user) - (group group) - (supplementary-groups '("agate")) - (system? #t) - (comment "agate server user") - (home-directory "/var/empty") - (shell (file-append shadow "/sbin/nologin"))))))) + (lambda (config) + (let ((group (agate-configuration-group config)) + (user (agate-configuration-user config))) + `(,@(if (equal? group "agate") + '() + (list (user-group (name "agate") (system? #t)))) + ,(user-group + (name group) + (system? #t)) + ,(user-account + (name user) + (group group) + (supplementary-groups '("agate")) + (system? #t) + (comment "agate server user") + (home-directory "/var/empty") + (shell (file-append shadow "/sbin/nologin"))))))) (define agate-service-type (service-type |