Merge ~hloeung/mailman3-core-charm:master into mailman3-core-charm:master

[Haw Loeung]

Fixed preserving the transport required by mailman3

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Benjamin Allot (ballot)]

LGTM

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 36f3623ef8edda6f6b547e4c6c425382a0ad5e6b

diff --git a/reactive/mailman3_core.py b/reactive/mailman3_core.py
index 42453dd..da3c707 100644
--- a/reactive/mailman3_core.py
+++ b/reactive/mailman3_core.py
@@ -89,9 +89,10 @@ def configure_postfix():
     subprocess.check_output(['postconf', 'smtp_address_preference=ipv4', 'lmtp_address_preference=ipv4',
                              'default_transport=smtp', 'relay_transport=smtp',
                              'smtpd_relay_restrictions=permit_mynetworks defer_unauth_destination'])
+    transports = []
     if os.path.exists('/var/lib/mailman3/data/postfix_lmtp'):
-        subprocess.check_output(['postconf', 'transport_maps=hash:/var/lib/mailman3/data/postfix_lmtp',
-                                 'relay_recipient_maps=hash:/var/lib/mailman3/data/postfix_lmtp',
+        transports.append('hash:/var/lib/mailman3/data/postfix_lmtp')
+        subprocess.check_output(['postconf', 'relay_recipient_maps=hash:/var/lib/mailman3/data/postfix_lmtp',
                                  'local_recipient_maps=hash:/var/lib/mailman3/data/postfix_lmtp'])
         subprocess.check_output(['postmap', '/var/lib/mailman3/data/postfix_lmtp'])
     if os.path.exists('/var/lib/mailman3/data/postfix_domains'):
@@ -100,16 +101,18 @@ def configure_postfix():
 
     subprocess.check_output(['postconf', 'smtpd_sender_restrictions=reject_unknown_sender_domain'])
 
+    transport_maps = config.get('transport_maps', '')
+    if transport_maps:
+        host.write_file('/etc/postfix/transport', transport_maps)
+        subprocess.check_output(['postmap', '/etc/postfix/transport'])
+        transports.append('hash:/etc/postfix/transport')
+
     # HyperKitty expects messages will all have the 'Message-ID' header,
     # unfortunately not all clients do so let's work around it (LP: #1776658)
     subprocess.check_output(['postconf', 'always_add_missing_headers=yes',
                                          'local_header_rewrite_clients=static:all'])
 
-    transport_maps = config.get('transport_maps', '')
-    if transport_maps:
-        host.write_file('/etc/postfix/transport', transport_maps)
-        subprocess.check_output(['postmap', '/etc/postfix/transport'])
-        subprocess.check_output(['postconf', 'transport_maps=hash:/etc/postfix/transport'])
+    subprocess.check_output(['postconf', 'transport_maps={}'.format(', '.join(transports))])
 
     if config["enable_spamassassin"]:
         configure_spamassassin()