diff options
Diffstat (limited to 'src/org/euandre/queue.scm')
| -rw-r--r-- | src/org/euandre/queue.scm | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/src/org/euandre/queue.scm b/src/org/euandre/queue.scm index 476cf95..193f430 100644 --- a/src/org/euandre/queue.scm +++ b/src/org/euandre/queue.scm @@ -120,7 +120,6 @@ postfix-configuration? postfix-configuration-postfix - postfix-configuration-mail-in-home? postfix-configuration-enable-submission? postfix-configuration-set-sendmail? postfix-configuration-master.cf-file @@ -159,7 +158,6 @@ dovecot-configuration? dovecot-configuration-package - dovecot-configuration-mail-in-home? dovecot-configuration-mail-location dovecot-configuration-raw-file dovecot-configuration-extra-content @@ -906,7 +904,6 @@ By default, the daemon runs in a container."))) make-postfix-configuration postfix-configuration? (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)) (master.cf-file postfix-configuration-master.cf-file (default #f)) @@ -1059,7 +1056,7 @@ mynetworks = 127.0.0.0/8 (define (generate-main.cf config) (match-record config <postfix-configuration> - (mail-in-home? enable-submission? mail-directory queue-directory data-directory + (enable-submission? mail-directory queue-directory data-directory user setgid-group hostname main.cf-extra sasl-dirname) (format #f "compatibility_level = 3.6 @@ -1071,17 +1068,14 @@ setgid_group = ~a header_checks = regexp:{ { /^Received:.*/ IGNORE }, { /^X-Originating-IP:.*/ IGNORE } } -~a +mail_spool_directory = ~a ~a~a" queue-directory data-directory user setgid-group - - (if mail-in-home? - "home_mailbox = Mail/Inbox/" - (string-append "mail_spool_directory = " mail-directory)) + mail-directory main.cf-extra (if enable-submission? (main.cf-internet-extra @@ -1366,7 +1360,6 @@ correctly."))) make-dovecot-configuration dovecot-configuration? (package dovecot-configuration-package (default dovecot)) - (mail-in-home? dovecot-configuration-mail-in-home? (default #f)) (mail-location dovecot-configuration-mail-location (default "/var/mail/")) (raw-file dovecot-configuration-raw-file (default #f)) (extra-content dovecot-configuration-extra-content (default "")) @@ -1389,7 +1382,7 @@ correctly."))) (define (generate-dovecot-config config) (match-record config <dovecot-configuration> - (mail-in-home? mail-location user group auth-worker-group untrusted-user + (mail-location user group auth-worker-group untrusted-user hostname base-dir state-dir extra-content) (format #f "protocols = imap @@ -1420,7 +1413,7 @@ state_dir = ~a verbose_proctitle = yes -mail_location = maildir:~a:INBOX=~a:LAYOUT=fs +mail_location = maildir:~a%u:INBOX=~a%u:LAYOUT=fs namespace inbox { inbox = yes @@ -1456,10 +1449,8 @@ namespace inbox { state-dir base-dir state-dir - - (if mail-in-home? "~/Mail" (string-append mail-location "%u")) - (if mail-in-home? "~/Mail/Inbox" (string-append mail-location "%u")) - + mail-location + mail-location extra-content))) (define (dovecot-etc-files config) |