summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail-server/postfix.nix3
-rw-r--r--mail-server/rspamd.nix2
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";