diff options
Diffstat (limited to 'src/org/euandre/queue.scm')
| -rw-r--r-- | src/org/euandre/queue.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/org/euandre/queue.scm b/src/org/euandre/queue.scm index d7122e2..225fdf5 100644 --- a/src/org/euandre/queue.scm +++ b/src/org/euandre/queue.scm @@ -90,6 +90,7 @@ dkimproxyout-configuration-package dkimproxyout-configuration-user dkimproxyout-configuration-group + dkimproxyout-configuration-supplementary-groups dkimproxyout-configuration-config-name dkimproxyout-configuration-listen dkimproxyout-configuration-relay @@ -664,6 +665,7 @@ By default, the daemon runs in a container."))) (package dkimproxyout-configuration-package (default dkimproxy)) (user dkimproxyout-configuration-user (default "dkimproxyout")) (group dkimproxyout-configuration-group (default "dkimproxyout")) + (supplementary-groups dkimproxyout-configuration-supplementary-groups (default '())) (config-name dkimproxyout-configuration-config-name (default "dkimproxyout.conf")) (listen dkimproxyout-configuration-listen (default "127.0.0.1:10027")) (relay dkimproxyout-configuration-relay (default "127.0.0.1:10028")) @@ -708,11 +710,12 @@ keyfile ~a/private.key (define (dkimproxyout-accounts config) (match-record config <dkimproxyout-configuration> - (user group) + (user group supplementary-groups) (list (user-account (name user) (group group) + (supplementary-groups supplementary-groups) (comment "DKIMproxy.out signing system user") (home-directory "/var/empty") (create-home-directory? #f) @@ -764,10 +767,9 @@ keyfile ~a/private.key (chmod private-key #o400) (chmod public-key #o644)))))) - (define (dkimproxyout-shepherd-service config) (match-record config <dkimproxyout-configuration> - (package user group config-name data-directory + (package user group supplementary-groups config-name data-directory run-in-container? container-name container-namespaces extra-mappings) (let* ((config-file (string-append "/etc/" config-name)) (bin (file-append package "/bin/dkimproxy.out")) @@ -794,7 +796,8 @@ keyfile ~a/private.key (start #~(make-forkexec-constructor (list #$cmd "--conf_file" #$config-file) #:user #$user - #:group #$group)) + #:group #$group + #:supplementary-groups '(#$@supplementary-groups))) (stop #~(make-kill-destructor)) (actions (list |