diff options
Diffstat (limited to 'src/org/euandre')
| -rw-r--r-- | src/org/euandre/queue.scm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/org/euandre/queue.scm b/src/org/euandre/queue.scm index 71cf89d..45e3e47 100644 --- a/src/org/euandre/queue.scm +++ b/src/org/euandre/queue.scm @@ -873,7 +873,7 @@ By default, the daemon runs in a container."))) postfix-configuration make-postfix-configuration postfix-configuration? - (postfix postfix-configuration-postfix (default postfix)) + (package postfix-configuration-package (default postfix)) (mail-in-home? postfix-configuration-mail-in-home? (default #f)) (enable-submission? postfix-configuration-enable-submission? (default #f)) (set-sendmail? postfix-configuration-set-sendmail? (default #t)) @@ -1039,7 +1039,7 @@ smtp_sasl_mechanism_filter = login, plain ;; postfix -> package (define (generate-main.cf config) (match-record config <postfix-configuration> - (postfix mail-in-home? enable-submission? queue-directory data-directory + (mail-in-home? enable-submission? queue-directory data-directory user setgid-group hostname main.cf-extra) (format #f "compatibility_level = 3.6 @@ -1101,23 +1101,23 @@ header_checks = regexp:{ { /^Received:.*/ IGNORE }, { /^X-Originating-IP:.*/ IGN (define (postfix-setuid-programs config) (match-record config <postfix-configuration> - (postfix setgid-group set-sendmail?) + (package setgid-group set-sendmail?) (append (list (setuid-program - (program (file-append postfix "/sbin/postdrop")) + (program (file-append package "/sbin/postdrop")) (setuid? #f) (setgid? #t) (group setgid-group)) (setuid-program - (program (file-append postfix "/sbin/postqueue")) + (program (file-append package "/sbin/postqueue")) (setuid? #f) (setgid? #t) (group setgid-group))) (if set-sendmail? (list (setuid-program - (program (file-append postfix "/sbin/sendmail")) + (program (file-append package "/sbin/sendmail")) (setuid? #f) (setgid? #t) (group setgid-group))) @@ -1145,10 +1145,10 @@ header_checks = regexp:{ { /^Received:.*/ IGNORE }, { /^X-Originating-IP:.*/ IGN (define (postfix-shepherd-service config) (match-record config <postfix-configuration> - (postfix config-dirname data-directory queue-directory + (package config-dirname data-directory queue-directory run-in-container? container-name container-namespaces extra-mappings) (let* ((config-dir (string-append "/etc/" config-dirname)) - (bin (file-append postfix "/sbin/postfix")) + (bin (file-append package "/sbin/postfix")) (cmd (if (not run-in-container?) bin (least-authority-wrapper @@ -1178,7 +1178,7 @@ header_checks = regexp:{ { /^Received:.*/ IGNORE }, { /^X-Originating-IP:.*/ IGN required daemons and commands.") (start #~(make-forkexec-constructor (list - #$(file-append postfix "/sbin/postfix") + #$cmd "-c" #$config-dir "start-fg") @@ -1268,7 +1268,7 @@ max_age: 604800 (service-extension activation-service-type postfix-activation) (service-extension profile-service-type - (compose list postfix-configuration-postfix)) + (compose list postfix-configuration-package)) (service-extension shepherd-root-service-type postfix-shepherd-service))) |