aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/org/euandre/queue.scm11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/org/euandre/queue.scm b/src/org/euandre/queue.scm
index bc3a45f..655fcb5 100644
--- a/src/org/euandre/queue.scm
+++ b/src/org/euandre/queue.scm
@@ -63,7 +63,7 @@
cyrus-sasl-configuration
make-cyrus-sasl-configuration
cyrus-sasl-configuration?
- cyrus-sasl-configuration-cyrus-sasl
+ cyrus-sasl-configuration-package
cyrus-sasl-configuration-user
cyrus-sasl-configuration-group
cyrus-sasl-configuration-supplementary-groups
@@ -507,7 +507,7 @@ to the list of supplementary groups of the user of such running process.")))
cyrus-sasl-configuration
make-cyrus-sasl-configuration
cyrus-sasl-configuration?
- (cyrus-sasl cyrus-sasl-configuration-cyrus-sasl (default cyrus-sasl))
+ (package cyrus-sasl-configuration-package (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")))
@@ -566,13 +566,12 @@ to the list of supplementary groups of the user of such running process.")))
(name group)
(system? #t)))))
-
(define (cyrus-sasl-shepherd-service config)
(match-record config <cyrus-sasl-configuration>
- (cyrus-sasl user group supplementary-groups authmech config-dirname run-directory
+ (package user group supplementary-groups authmech config-dirname run-directory
services run-in-container? container-name container-namespaces extra-mappings)
(let* ((config-dir (string-append "/etc/" config-dirname))
- (bin (file-append cyrus-sasl "/sbin/saslauthd"))
+ (bin (file-append package "/sbin/saslauthd"))
(cmd (if (not run-in-container?)
bin
(least-authority-wrapper
@@ -625,7 +624,7 @@ to the list of supplementary groups of the user of such running process.")))
(service-extension activation-service-type
cyrus-sasl-activation)
(service-extension profile-service-type
- (compose list cyrus-sasl-configuration-cyrus-sasl))
+ (compose list cyrus-sasl-configuration-package))
(service-extension account-service-type
cyrus-sasl-accounts)
(service-extension shepherd-root-service-type