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

[Haw Loeung]

Prefer IPv4, otherwise we'll end up with issues such as talking to hosts IPv6 even though all we have are link-local addresses

Allow overriding site_owner, which is the e-mail used for subscription notifications and such.

Also make the postfix hash maps.

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

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

[Laurent Sesquès (sajoupa)]

review: Approve

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

Change successfully merged at revision df40351eb2f552e99d7591ee0a08ca6cf5ba2710

diff --git a/config.yaml b/config.yaml
index 564d78b..8265ce4 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,4 +1,9 @@
 options:
+  site_owner:
+    default: [e-mail]
+    type: string
+    description: |
+      E-mail used by mailman for e-mail verifications etc.
   hostname:
     default: ""
     type: string
diff --git a/reactive/mailman3_core.py b/reactive/mailman3_core.py
index 2437a75..3a99872 100644
--- a/reactive/mailman3_core.py
+++ b/reactive/mailman3_core.py
@@ -30,7 +30,7 @@ def write_config():
            group="list",
            perms=0o640,
            context={'config': config})
-    host.service('restart', 'mailman3')
+    host.service_restart('mailman3')
 
 
 # Once mailman is installed, we can generate our REST API password
@@ -59,7 +59,6 @@ def configure_postfix():
 
     myhostname = config.get('hostname', subprocess.getoutput(['hostname', '--fqdn']).strip())
     subprocess.check_output(['postconf', 'myhostname={}'.format(myhostname)])
-
     smtpd_tls_cert_file = config.get('ssl_cert', '')
     if not smtpd_tls_cert_file and os.path.exists('/etc/ssl/certs/ssl-cert-snakeoil.pem'):
         smtpd_tls_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
@@ -77,14 +76,19 @@ def configure_postfix():
         subprocess.check_output(['postconf', 'smtp_tls_security_level=may',
                                  'smtp_tls_policy_maps=hash:/etc/postfix/tls_policy'])
         host.write_file('/etc/postfix/tls_policy', smtp_tls_policy_maps)
+        subprocess.check_output(['postmap', '/etc/postfix/tls_policy'])
 
-    subprocess.check_output(['postconf', 'inet_interfaces=all',
+    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'])
-    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'])
-    subprocess.check_output(['postfix', 'reload'])
+    if os.path.exists('/var/lib/mailman3/data/postfix_lmtp'):
+        subprocess.check_output(['postconf', 'transport_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'):
+        subprocess.check_output(['postconf', 'relay_domains=hash:/var/lib/mailman3/data/postfix_domains'])
+        subprocess.check_output(['postmap', '/var/lib/mailman3/data/postfix_domains'])
+    host.service_reload('postfix')
     # Open the SMTP port
     hookenv.open_port(25)
     set_flag('mailman.postfix.configured')
@@ -128,6 +132,7 @@ def configure_database(pgsql):
 @when('config.changed')
 def write_updated_config():
     hookenv.status_set('maintenance', 'updating configuration')
+    clear_flag('mailman.postfix.configured')
     write_config()
     hookenv.status_set('active', 'ready')
 
diff --git a/templates/mailman.tmpl b/templates/mailman.tmpl
index f09886d..2508cff 100644
--- a/templates/mailman.tmpl
+++ b/templates/mailman.tmpl
@@ -25,7 +25,7 @@
 # delivered to a human, but which can't be delivered to a list owner (e.g. a
 # bounce from a list owner), will be sent to this address.  It should point to
 # a human.
-site_owner: [e-mail]
+site_owner: {{ config.site_owner }}
 
 # This is the local-part of an email address used in the From field whenever a
 # message comes from some entity to which there is no natural reply recipient.