diff options
| author | Robin Raymond <robin@robinraymond.de> | 2019-05-03 14:13:42 +0200 |
|---|---|---|
| committer | Robin Raymond <robin@robinraymond.de> | 2019-05-03 14:13:42 +0200 |
| commit | 642a15fbf70e4b78ae0d7a2bcbefb3f7ee7aa9ce (patch) | |
| tree | 77769b0a767687354b95b0612156827354e9781a | |
| parent | 72e79e5c38a6d58e5c19cf9e394476514a33ff5f (diff) | |
| parent | bce95d022934070f9dee10928b1aadf994bb60da (diff) | |
Merge branch 'master' of gitlab.com:simple-nixos-mailserver/nixos-mailserverv2.2.1
| -rw-r--r-- | mail-server/postfix.nix | 3 | ||||
| -rw-r--r-- | mail-server/rspamd.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mail-server/postfix.nix b/mail-server/postfix.nix index 9ad668a..19f5e52 100644 --- a/mail-server/postfix.nix +++ b/mail-server/postfix.nix @@ -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 diff --git a/mail-server/rspamd.nix b/mail-server/rspamd.nix index fd3bfaf..55fe21a 100644 --- a/mail-server/rspamd.nix +++ b/mail-server/rspamd.nix @@ -42,7 +42,7 @@ in ''); workers.rspamd_proxy = { - type = "proxy"; + type = "rspamd_proxy"; bindSockets = [{ socket = "/run/rspamd/rspamd-milter.sock"; mode = "0664"; |