diff options
author | Julien Lepiller <julien@lepiller.eu> | 2021-01-16 20:42:32 +0100 |
---|---|---|
committer | Leo Prikler <leo.prikler@student.tugraz.at> | 2021-01-17 20:40:52 +0100 |
commit | e82a713c159d83d33546b672d2474426b48eb6ba (patch) | |
tree | 3b76344756179cb3824663f3582b3fde3cf5fe64 /gnu | |
parent | 476b333fbcda397557382a0988646b8bd177874d (diff) | |
download | guix-e82a713c159d83d33546b672d2474426b48eb6ba.tar guix-e82a713c159d83d33546b672d2474426b48eb6ba.tar.gz |
gnu: php-fpm: Ensure no duplicate group.
* gnu/services/web.scm (php-fpm-accounts): Ensure `php-fpm` group is not
duplicated.
Signed-off-by: Leo Prikler <leo.prikler@student.tugraz.at>
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/services/web.scm | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 855f4e649b..ff7b262b6a 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -922,19 +922,20 @@ of index files." (define php-fpm-accounts (match-lambda (($ <php-fpm-configuration> php socket user group socket-user socket-group _ _ _ _ _ _) - (list - (user-group (name "php-fpm") (system? #t)) - (user-group - (name group) - (system? #t)) - (user-account - (name user) - (group group) - (supplementary-groups '("php-fpm")) - (system? #t) - (comment "php-fpm daemon user") - (home-directory "/var/empty") - (shell (file-append shadow "/sbin/nologin"))))))) + `(,@(if (equal? group "php-fpm") + '() + (list (user-group (name "php-fpm") (system? #t)))) + ,(user-group + (name group) + (system? #t)) + ,(user-account + (name user) + (group group) + (supplementary-groups '("php-fpm")) + (system? #t) + (comment "php-fpm daemon user") + (home-directory "/var/empty") + (shell (file-append shadow "/sbin/nologin"))))))) (define (default-php-fpm-config socket user group socket-user socket-group pid-file log-file pm display-errors timezone workers-log-file) |