From 184975be76ffee8bf42c45055a1aae44c6ea21cf Mon Sep 17 00:00:00 2001 From: Christian Kauhaus Date: Fri, 3 May 2019 10:54:15 +0200 Subject: [PATCH 1/2] Fix renamed rspamd_proxy option Fixes #152 --- mail-server/rspamd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"; From bce95d022934070f9dee10928b1aadf994bb60da Mon Sep 17 00:00:00 2001 From: Christian Kauhaus Date: Fri, 3 May 2019 11:25:23 +0000 Subject: [PATCH 2/2] Use services.postfix.virtual option SNM used to define virtual_alias_maps in extraConfig which collides with the same parameter defined by the standard services.postfix.virtual option. This led to *lots* of warnings during postfix startup like ``` May 02 18:29:58 nun postfix/master[24758]: warning: /etc/postfix/main.cf, line 47: overriding earlier entry: virtual_alias_maps=hash:/etc/postfix/virtual ``` Refraining from overriding virtual_alias_maps has the additional advantage that virtual aliases defined by other modules dont' stop working with SNM. --- mail-server/postfix.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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