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

[Haw Loeung]

Fixed archiver URL and also postfix relaying

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

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

[Barry Price (barryprice)]

+1

review: Approve

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

Change successfully merged at revision 954f208556f5d78acc794fbd0650c3b62620729e

diff --git a/reactive/mailman3_core.py b/reactive/mailman3_core.py
index 99013c4..c9e7df3 100644
--- a/reactive/mailman3_core.py
+++ b/reactive/mailman3_core.py
@@ -55,6 +55,9 @@ def initial_setup():
 @when_not('mailman.postfix.configured')
 def configure_postfix():
     hookenv.status_set('maintenance', 'configuring postfix for posts to mailing lists')
+    subprocess.check_output(['postconf', 'inet_interfaces=all',
+                             'default_transport=smtp', 'relay_transport=smtp',
+                             'smtpd_relay_restrictions=permit_mynetworks defer_unauth_destination'])
     subprocess.check_output(['postconf', 'transport_maps=hash:/var/lib/mailman3/data/postfix_lmtp',
                              'local_recipient_maps=hash:/var/lib/mailman3/data/postfix_lmtp',
                              'relay_domains=hash:/var/lib/mailman3/data/postfix_domains'])
diff --git a/templates/mailman-hyperkitty.tmpl b/templates/mailman-hyperkitty.tmpl
index d844838..c702ca9 100644
--- a/templates/mailman-hyperkitty.tmpl
+++ b/templates/mailman-hyperkitty.tmpl
@@ -3,7 +3,7 @@
 # address will be used by Mailman to forward incoming emails to HyperKitty
 # for archiving. It does not need to be publicly available, in fact it's
 # better if it is not.
-base_url: http://{{ config.archiver_ip }}/hyperkitty/
+base_url: http://{{ config.archiver_ip }}/mailman3/hyperkitty/
 # Shared API key, must be the identical to the value in HyperKitty's
 # settings.
 api_key: {{ config.archiver_key }}