summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kauhaus <christian@kauhaus.de>2019-05-03 11:25:23 +0000
committerRobin Raymond <robin@robinraymond.de>2019-05-03 11:25:23 +0000
commitbce95d022934070f9dee10928b1aadf994bb60da (patch)
tree8fb75051f08a4c3d1ce1b4a91c44678c15f2f86c
parent184975be76ffee8bf42c45055a1aae44c6ea21cf (diff)
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.
-rw-r--r--mail-server/postfix.nix3
1 files changed, 2 insertions, 1 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