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

[Haw Loeung]

Set proper status - LP: #1772399

Set proper status - LP: #1772399

Also, fix admin credential generation to only do so when it doesn't
exist.

Finally, don't always run apt purging, especially on update-status
hooks.

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

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

[Tom Haddon (mthaddon)]

LGTM

review: Approve

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

Change successfully merged at revision 07d5e8623530146b15cd2c37afa29654f5c80ec7

diff --git a/config.yaml b/config.yaml
index e5db6d3..6dfb59a 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,8 +1,4 @@
 options:
-  additional-packages:
-    type: string
-    default: ""
-    description: "Additional packages to install on the unit."
   nagios_context:
     default: "juju"
     type: string
diff --git a/layer.yaml b/layer.yaml
index 52b8b6f..0582e0f 100644
--- a/layer.yaml
+++ b/layer.yaml
@@ -1,9 +1,10 @@
 repo: lp:mailman3-core-charm
 includes:
+  - 'layer:basic'
+  - 'layer:apt'
   - 'interface:generic-ip-port-user-pass'
+  - 'interface:nrpe-external-master'
   - 'interface:pgsql'
-  - 'layer:apt'
-  - 'layer:basic'
 options:
   apt:
     packages:
diff --git a/reactive/mailman3_core.py b/reactive/mailman3_core.py
index 45a07f0..1e61cce 100644
--- a/reactive/mailman3_core.py
+++ b/reactive/mailman3_core.py
@@ -37,14 +37,15 @@ def write_config():
 @when_not('mailman.initial_setup')
 def initial_setup():
     db = unitdata.kv()
-    # Generate a relatively random password
-    chars = string.ascii_letters + string.digits
-    password = ''.join((random.choice(chars)) for x in range(40))
-    db.set('admin_password', password)
-    # Let's just hard set this for now, we can expose it in the juju config later
-    db.set('admin_user', 'restadmin')
-    db.set('admin_port', 8001)
-    db.set('admin_ip', hookenv.unit_get('private-address'))
+    if not db.get('admin_password'):
+        # Generate a relatively random password
+        chars = string.ascii_letters + string.digits
+        password = ''.join((random.choice(chars)) for x in range(40))
+        db.set('admin_password', password)
+        # Let's just hard set this for now, we can expose it in the juju config later
+        db.set('admin_user', 'restadmin')
+        db.set('admin_port', 8001)
+        db.set('admin_ip', hookenv.unit_get('private-address'))
     queue_install(['python3-mailman-hyperkitty'])
     # Open the SMTP port
     hookenv.open_port(25)
@@ -58,6 +59,7 @@ def initial_setup():
 @when_not('mailman.django.purged')
 def purge_extra_mailman_crap():
     purge('python-django-hyperkitty')
+    set_flag('mailman.django.purged')
 
 
 # When we connect to the database units, request our database and extensions
@@ -86,7 +88,9 @@ def configure_database(pgsql):
 @when('db.master.available')
 @when('config.changed')
 def write_updated_config():
+    hookenv.status_set('maintenance', 'updating configuration')
     write_config()
+    hookenv.status_set('active', 'ready')
 
 
 # Make sure we've got our REST API creds, then publish our relation data.