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

[Haw Loeung]

Ensure postfix is installed and configure it up

[🤖 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 879a011f01545c08b5fa502610f951c5c66bccd3

diff --git a/layer.yaml b/layer.yaml
index 0582e0f..d297df3 100644
--- a/layer.yaml
+++ b/layer.yaml
@@ -9,3 +9,4 @@ options:
   apt:
     packages:
       - mailman3
+      - postfix
diff --git a/reactive/mailman3_core.py b/reactive/mailman3_core.py
index 31c2d23..99013c4 100644
--- a/reactive/mailman3_core.py
+++ b/reactive/mailman3_core.py
@@ -1,5 +1,6 @@
-import string
 import random
+import string
+import subprocess
 from charms.apt import purge, queue_install
 from charms.reactive import clear_flag, endpoint_from_flag, set_flag, when, when_any, when_not  # noqa: F401
 from charmhelpers.core import hookenv, unitdata
@@ -47,9 +48,21 @@ def initial_setup():
         db.set('admin_port', 8001)
         db.set('admin_ip', hookenv.unit_get('private-address'))
     queue_install(['python3-mailman-hyperkitty'])
+    set_flag('mailman.initial_setup')
+
+
+@when('apt.installed.postfix')
+@when_not('mailman.postfix.configured')
+def configure_postfix():
+    hookenv.status_set('maintenance', 'configuring postfix for posts to mailing lists')
+    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'])
     # Open the SMTP port
     hookenv.open_port(25)
-    set_flag('mailman.initial_setup')
+    set_flag('mailman.postfix.configured')
+    hookenv.status_set('active', 'ready')
 
 
 # HyperKitty's recommended dependencies include, basically, all of Django so
@@ -160,6 +173,7 @@ def setup_nagios(nagios):
     if hookenv.hook_name() == 'update-status':
         return
 
+    hookenv.status_set('maintenance', 'setting up NRPE checks')
     # Ask charmhelpers.contrib.charmsupport's nrpe to work out our hostname
     hostname = nrpe.get_nagios_hostname()
     nrpe_setup = nrpe.NRPE(hostname=hostname)
@@ -182,3 +196,4 @@ def setup_nagios(nagios):
     nrpe_setup.add_check('postfix_port', 'Check postfix port', postfix_check)
 
     nrpe_setup.write()
+    hookenv.status_set('active', 'ready')
diff --git a/templates/mailman.tmpl b/templates/mailman.tmpl
index 2039bba..f09886d 100644
--- a/templates/mailman.tmpl
+++ b/templates/mailman.tmpl
@@ -258,7 +258,7 @@ smtp_pass:
 # Where the LMTP server listens for connections.  Use 127.0.0.1 instead of
 # localhost for Postfix integration, because Postfix only consults DNS
 # (e.g. not /etc/hosts).
-lmtp_host: 127.0.0.1
+lmtp_host: localhost
 lmtp_port: 8024
 
 # Where can we find the mail server specific configuration file?  The path can