christian
/
nixos-mailserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent 72e79e5c38 bce95d0229
commit 642a15fbf7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mail-server/postfix.nix
View File

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

2
mail-server/rspamd.nix
View File

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