diff options
| -rw-r--r-- | src/xyz/euandreh/queue.scm | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/xyz/euandreh/queue.scm b/src/xyz/euandreh/queue.scm index 88a405c..89e62dd 100644 --- a/src/xyz/euandreh/queue.scm +++ b/src/xyz/euandreh/queue.scm @@ -376,13 +376,13 @@ collections.OrderedDict that works in Python 2.4-2.6.") cyrus-sasl-configuration make-cyrus-sasl-configuration cyrus-sasl-configuration? - (cyrus-sasl cyrus-sasl-configuration-cyrus-sasl (default cyrus-sasl)) - (user cyrus-sasl-configuration-user (default "cyrus-sasl")) - (group cyrus-sasl-configuration-group (default "cyrus-sasl")) - (extra-groups cyrus-sasl-configuration-extra-groups (default '("etc-shadow"))) - (authmech cyrus-sasl-configuration-authmech (default "shadow")) - (services cyrus-sasl-configuration-services (default '())) - (state-dir cyrus-sasl-configuration-state-dir (default "/var/lib/saslauthd"))) + (cyrus-sasl cyrus-sasl-configuration-cyrus-sasl (default cyrus-sasl)) + (user cyrus-sasl-configuration-user (default "cyrus-sasl")) + (group cyrus-sasl-configuration-group (default "cyrus-sasl")) + (supplementary-groups cyrus-sasl-configuration-supplementary-groups (default '("etc-shadow"))) + (authmech cyrus-sasl-configuration-authmech (default "shadow")) + (services cyrus-sasl-configuration-services (default '())) + (state-dir cyrus-sasl-configuration-state-dir (default "/var/lib/saslauthd"))) (define (cyrus-sasl-etc-files config) (match-record config <cyrus-sasl-configuration> @@ -416,12 +416,12 @@ collections.OrderedDict that works in Python 2.4-2.6.") (define (cyrus-sasl-accounts config) (match-record config <cyrus-sasl-configuration> - (user group extra-groups) + (user group supplementary-groups) (list (user-account (name user) (group group) - (supplementary-groups extra-groups) + (supplementary-groups supplementary-groups) (comment "Cyrus SASL system user") (home-directory "/var/empty") (shell (file-append shadow "/sbin/nologin")) @@ -432,7 +432,7 @@ collections.OrderedDict that works in Python 2.4-2.6.") (define (cyrus-sasl-shepherd-service config) (match-record config <cyrus-sasl-configuration> - (cyrus-sasl user group authmech state-dir) + (cyrus-sasl user group supplementary-groups authmech state-dir) (list (shepherd-service (provision '(cyrus-sasl)) @@ -445,8 +445,9 @@ collections.OrderedDict that works in Python 2.4-2.6.") "-d" "-m" #$state-dir) - #:user #$user - #:group #$group)) + #:user #$user + #:group #$group + #:supplementary-groups #$supplementary-groups)) (stop #~(make-kill-destructor)))))) (define cyrus-sasl-service-type |