From 71eb192c73d84e1f189a684306d24891fc7b9d69 Mon Sep 17 00:00:00 2001
From: Julian Rother <julian@holzmarkt.com>
Date: Sat, 8 Feb 2025 03:08:47 +0100
Subject: [PATCH] Add parameters for postfix maps

---
 defaults/main.yml            | 3 +++
 templates/postfix/main.cf.j2 | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 6f4847c..b5855a3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -22,6 +22,9 @@ mailserver:
       drop_user_agent:
         regex: '^User-Agent:'
         action: IGNORE
+    relay_domains: ''
+    virtual_alias_maps: ''
+    transport_maps: ''
   postsrsd:
     srs_domain: "srs.{{ inventory_hostname }}"
   dovecot:
diff --git a/templates/postfix/main.cf.j2 b/templates/postfix/main.cf.j2
index f4478ae..ddb53b6 100644
--- a/templates/postfix/main.cf.j2
+++ b/templates/postfix/main.cf.j2
@@ -72,8 +72,8 @@ smtpd_tls_auth_only = yes
 smtp_tls_security_level = may
 
 # Postfixadmin and dovecot integration
-relay_domains = $mydestination, pgsql:/etc/postfix/pgsql/relay_domains.cf
-virtual_alias_maps = pgsql:/etc/postfix/pgsql/virtual_alias_maps.cf pgsql:/etc/postfix/pgsql/virtual_alias_domain_maps.cf pgsql:/etc/postfix/pgsql/virtual_alias_domain_catchall_maps.cf
+relay_domains = $mydestination pgsql:/etc/postfix/pgsql/relay_domains.cf {{ mailserver.postfix.relay_domains }}
+virtual_alias_maps = pgsql:/etc/postfix/pgsql/virtual_alias_maps.cf pgsql:/etc/postfix/pgsql/virtual_alias_domain_maps.cf pgsql:/etc/postfix/pgsql/virtual_alias_domain_catchall_maps.cf {{ mailserver.postfix.virtual_alias_maps }}
 virtual_mailbox_domains = pgsql:/etc/postfix/pgsql/virtual_domains_maps.cf
 virtual_mailbox_maps = pgsql:/etc/postfix/pgsql/virtual_mailbox_maps.cf
 virtual_transport = dovecot
@@ -85,7 +85,7 @@ smtpd_sasl_type = dovecot
 smtpd_sasl_path = private/auth
 
 # Special address that discards all mails
-transport_maps = inline:{discard@{{ inventory_hostname }}=discard:}
+transport_maps = inline:{discard@{{ inventory_hostname }}=discard:} {{ mailserver.postfix.transport_maps }}
 
 # PostSRS integration
 sender_canonical_maps = tcp:localhost:10001