diff options
| author | Peter Simons <simons@cryp.to> | 2015-06-22 12:33:11 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-06-22 12:47:23 +0200 |
| commit | 88f4b75a00855c878624e465e1a83930aaa92858 (patch) | |
| tree | 9f23079a409cada267fb948f6efee4d22e270019 /nixos | |
| parent | e08074ff6d57890ea7c1c526e73c998d2dcdcefa (diff) | |
| download | nixlib-88f4b75a00855c878624e465e1a83930aaa92858.tar nixlib-88f4b75a00855c878624e465e1a83930aaa92858.tar.gz nixlib-88f4b75a00855c878624e465e1a83930aaa92858.tar.bz2 nixlib-88f4b75a00855c878624e465e1a83930aaa92858.tar.lz nixlib-88f4b75a00855c878624e465e1a83930aaa92858.tar.xz nixlib-88f4b75a00855c878624e465e1a83930aaa92858.tar.zst nixlib-88f4b75a00855c878624e465e1a83930aaa92858.zip | |
nixos: recipientDelimiter is no longer a valid configuration option in Postfix 2.11.x or later
Note that this change in Postfix might affect the mlmmj.nix service in ways I don't fully understand.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/mail/mlmmj.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/mail/postfix.nix | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix index db3a266d011f..1545c60f4de3 100644 --- a/nixos/modules/services/mail/mlmmj.nix +++ b/nixos/modules/services/mail/mlmmj.nix @@ -88,7 +88,6 @@ 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 ''; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index d81380aac231..3d9bb9ccf24c 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -77,8 +77,6 @@ let smtpd_tls_key_file = ${cfg.sslKey} smtpd_use_tls = yes - - recipientDelimiter = ${cfg.recipientDelimiter} '' + optionalString (cfg.virtual != "") '' virtual_alias_maps = hash:/etc/postfix/virtual @@ -291,14 +289,6 @@ 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 = " |