From bffc51401d8bddd7418b6d8546e9b6317619cf23 Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Sun, 3 Sep 2017 16:18:08 +0200
Subject: [PATCH 1/2] Add a recipient delimiter for extended addresses

---
 postfix/conf/main.cf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/postfix/conf/main.cf b/postfix/conf/main.cf
index 6cd514e8..4b8db9bd 100644
--- a/postfix/conf/main.cf
+++ b/postfix/conf/main.cf
@@ -28,6 +28,9 @@ mydestination =
 # Relayhost if any is configured
 relayhost = {{ RELAYHOST }}
 
+# Recipient delimiter for extended addresses
+recipient_delimiter = +
+
 ###############
 # TLS
 ###############

From 4ee086a52a3f60b54d31a400a0c0bdb503d61eba Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Sun, 10 Sep 2017 14:09:16 +0200
Subject: [PATCH 2/2] Make the recipient delimiter customizeable, fixes #233
 and #164

---
 .env.dist                 | 4 ++++
 dovecot/conf/dovecot.conf | 2 +-
 postfix/conf/main.cf      | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.env.dist b/.env.dist
index add937bd..d365eb75 100644
--- a/.env.dist
+++ b/.env.dist
@@ -73,6 +73,10 @@ RELAYHOST=
 # Fetchmail delay
 FETCHMAIL_DELAY=600
 
+# Recipient delimiter, character used to delimiter localpart from custom address part
+# e.g. localpart+custom@domain;tld
+RECIPIENT_DELIMITER=+
+
 ###################################
 # Nginx settings
 ###################################
diff --git a/dovecot/conf/dovecot.conf b/dovecot/conf/dovecot.conf
index 0f4b04d8..928b4d3e 100644
--- a/dovecot/conf/dovecot.conf
+++ b/dovecot/conf/dovecot.conf
@@ -127,7 +127,7 @@ service imap-login {
 
 protocol lmtp {
   mail_plugins = $mail_plugins sieve
-  recipient_delimiter = +
+  recipient_delimiter = {{ RECIPIENT_DELIMITER }}
 }
 
 service lmtp {
diff --git a/postfix/conf/main.cf b/postfix/conf/main.cf
index 4b8db9bd..b806a46f 100644
--- a/postfix/conf/main.cf
+++ b/postfix/conf/main.cf
@@ -29,7 +29,7 @@ mydestination =
 relayhost = {{ RELAYHOST }}
 
 # Recipient delimiter for extended addresses
-recipient_delimiter = +
+recipient_delimiter = {{ RECIPIENT_DELIMITER }}
 
 ###############
 # TLS