3
0
Fork 0
forked from mirrors/nixpkgs

postfix: fix recipient_delimiter option

This reverts commit 88f4b75a00 and fixes the
recipientDelimiter config option. Till then the camel case variant was used
while recipient_delimiter would have been right.
This commit is contained in:
Christoph Hrdinka 2015-06-26 14:03:21 +02:00
parent d405d036c5
commit 6839ad653a
2 changed files with 11 additions and 0 deletions

View file

@ -88,6 +88,7 @@ in
services.postfix = {
enable = true;
recipientDelimiter= "+";
extraMasterConf = ''
mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L ${spoolDir}/$nextHop
'';

View file

@ -77,6 +77,8 @@ let
smtpd_tls_key_file = ${cfg.sslKey}
smtpd_use_tls = yes
recipient_delimiter = ${cfg.recipientDelimiter}
''
+ optionalString (cfg.virtual != "") ''
virtual_alias_maps = hash:/etc/postfix/virtual
@ -289,6 +291,14 @@ in
description = "SSL key to use.";
};
recipientDelimiter = mkOption {
default = "";
example = "+";
description = "
Delimiter for address extension: so mail to user+test can be handled by ~user/.forward+test
";
};
virtual = mkOption {
default = "";
description = "