Merge branch 'master' of gitlab.com:simple-nixos-mailserver/nixos-mailserver

This commit is contained in:
Robin Raymond 2019-05-03 14:13:42 +02:00
commit 642a15fbf7
2 changed files with 3 additions and 2 deletions

View File

@ -127,6 +127,8 @@ in
sslCert = certificatePath;
sslKey = keyPath;
enableSubmission = true;
virtual =
(lib.concatStringsSep "\n" (all_valiases_postfix ++ catchAllPostfix));
extraConfig =
''
@ -143,7 +145,6 @@ in
virtual_mailbox_base = ${mailDirectory}
virtual_mailbox_domains = ${vhosts_file}
virtual_mailbox_maps = ${mappedFile "valias"}
virtual_alias_maps = ${mappedFile "valias"}
virtual_transport = lmtp:unix:/run/dovecot2/dovecot-lmtp
# sasl with dovecot

View File

@ -42,7 +42,7 @@ in
'');
workers.rspamd_proxy = {
type = "proxy";
type = "rspamd_proxy";
bindSockets = [{
socket = "/run/rspamd/rspamd-milter.sock";
mode = "0664";