From 88f4b75a00855c878624e465e1a83930aaa92858 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 22 Jun 2015 12:33:11 +0200
Subject: 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.
---
 nixos/modules/services/mail/mlmmj.nix   |  1 -
 nixos/modules/services/mail/postfix.nix | 10 ----------
 2 files changed, 11 deletions(-)

(limited to 'nixos')

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 = "
-- 
cgit 1.4.1