From 660e10d494a8cdd295f6ba4d906c35bfb54a8fa8 Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Fri, 5 Feb 2021 22:46:50 +0100
Subject: [PATCH] working configuration for sympa with incomming mail

---
 templates/main.cf.j2 | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/templates/main.cf.j2 b/templates/main.cf.j2
index 093cc58..1cadd3d 100644
--- a/templates/main.cf.j2
+++ b/templates/main.cf.j2
@@ -43,24 +43,11 @@ smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
 smtp_tls_security_level = may
 
 
-### transport configuration
-
-relay_domains = hash:/etc/postfix/transport_maps
-transport_maps =
-  hash:/etc/postfix/transport_maps,
-{% if postfix_with_sympa %}
-  hash:/etc/postfix/transport.sympa,
-  hash:/var/lib/sympa/transport,
-  hash:/etc/postfix/virtual.sympa,
-{% endif %}
-
-
 
 ### rules and restricitons
 
 message_size_limit = 52428800
 
-
 # some rules from http://www.postfix.org/SMTPD_ACCESS_README.html
 
 # Allow connections from trusted networks only.
@@ -109,6 +96,7 @@ smtpd_end_of_data_restrictions = check_policy_service unix:private/policy
 #}
 
 
+
 ### DKIM and DMARC
 
 non_smtpd_milters =
@@ -116,7 +104,7 @@ non_smtpd_milters =
   unix:/run/opendkim/opendkim.sock,
 {% endif %}
 {% if postfix_with_opendmarc %}
-  unix:/run/opendmarc/opendmarc.sock
+  unix:/run/opendmarc/opendmarc.sock,
 {% endif %}
 
 smtpd_milters =
@@ -124,10 +112,24 @@ smtpd_milters =
   unix:/run/opendkim/opendkim.sock,
 {% endif %}
 {% if postfix_with_opendmarc %}
-  unix:/run/opendmarc/opendmarc.sock
+  unix:/run/opendmarc/opendmarc.sock,
 {% endif %}
 
 
+
+### transport configuration
+
+relay_domains =
+  hash:/etc/postfix/transport_maps,
+transport_maps =
+  hash:/etc/postfix/transport_maps,
+{% if postfix_with_sympa %}
+  hash:/etc/postfix/transport.sympa,
+  hash:/var/lib/sympa/transport,
+{% endif %}
+
+
+
 ### Virtual Domain Hosting
 
 virtual_alias_domains =
@@ -150,7 +152,7 @@ virtual_mailbox_domains =
   proxy:mysql:/etc/postfix/postfixadmin-sql/mysql_virtual_domains_maps.cf,
 {% endif %}
 {% if postfix_with_sympa %}
-  hash:/etc/postfix/domains.sympa,
+  hash:/etc/postfix/transport.sympa,
 {% endif %}
 
 virtual_mailbox_maps =