From f474d081a0b966f37f310394d11fda068dcca531 Mon Sep 17 00:00:00 2001
From: Mauro Torrez <mauro@layer7.mx>
Date: Mon, 11 Mar 2024 13:33:06 -0300
Subject: [PATCH] v5: support plus address extensions

---
 .gitea/workflows/build.yml      | 2 +-
 Dockerfile                      | 2 ++
 confd/conf.d/setup_main.toml    | 2 ++
 confd/templates/setup_main.tmpl | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index ad228d3..80df679 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
         repo:
           - eumau/postfix
         tag:
-          - "4"
+          - "5"
     steps:
       -
         name: Set up QEMU
diff --git a/Dockerfile b/Dockerfile
index 7a4934c..9d55ee7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,6 +25,8 @@ ENV POSTSCREEN_DNSBL_THRESHOLD="3"
 ENV POSTSCREEN_DNSBL_WHITELIST_THRESHOLD="-1"
 ENV POSTSCREEN_ENABLE=no
 ENV POSTSCREEN_GREET_ACTION="enforce"
+ENV PROPAGATE_UNMATCHED_EXTENSIONS="canonical, virtual"
+ENV RECIPIENT_DELIMITER="+"
 ENV RELAYHOST=""
 ENV SMTP_FALLBACK_RELAY=""
 ENV SMTP_SASL_AUTH_ENABLE=""
diff --git a/confd/conf.d/setup_main.toml b/confd/conf.d/setup_main.toml
index 436717f..2da8566 100644
--- a/confd/conf.d/setup_main.toml
+++ b/confd/conf.d/setup_main.toml
@@ -10,6 +10,8 @@ keys = [
 "/myhostname",
 "/mynetworks",
 "/mynetworks/style",
+"/propagate/unmatched/extensions",
+"/recipient/delimiter",
 "/smtp/tls/security/level",
 "/smtpd/client/restrictions",
 "/smtpd/data/restrictions",
diff --git a/confd/templates/setup_main.tmpl b/confd/templates/setup_main.tmpl
index e148109..201d605 100644
--- a/confd/templates/setup_main.tmpl
+++ b/confd/templates/setup_main.tmpl
@@ -40,6 +40,8 @@ postconf alias_maps=hash:/etc/aliases
 {{ with getv "/myhostname" }}postconf myhostname='{{.}}'{{ end }}
 {{ with getv "/mynetworks" }}postconf mynetworks='{{.}}'{{ end }}
 {{ with getv "/mynetworks/style" }}postconf mynetworks_style='{{.}}'{{ end }}
+{{ with getv "/propagate/unmatched/extensions" }}postconf propagate_unmatched_extensions='{{.}}'{{ end }}
+{{ with getv "/recipient/delimiter" }}postconf recipient_delimiter='{{.}}'{{ end }}
 {{ with getv "/smtp/tls/security/level" }}postconf smtp_tls_security_level='{{.}}'{{ end }}
 {{ with getv "/smtpd/client/restrictions" }}postconf smtpd_client_restrictions='{{.}}'{{ end }}
 {{ with getv "/smtpd/data/restrictions" }}postconf smtpd_data_restrictions='{{.}}'{{ end }}