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

[Haw Loeung]

Set proper status - LP: #1772398

Set proper status - LP: #1772398

Also only generate django and hyperkitty secret keys when they don't
already exist.

Finally, don't run changed_mailman_data() on update-status hooks
firing.

[🤖 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 3379dc14e60412773330e637bc7093c3f92f780a

diff --git a/layer.yaml b/layer.yaml
index c55fa06..018b1ab 100644
--- a/layer.yaml
+++ b/layer.yaml
@@ -1,9 +1,10 @@
 repo: lp:mailman3-web-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_web.py b/reactive/mailman3_web.py
index c7880b1..400d459 100644
--- a/reactive/mailman3_web.py
+++ b/reactive/mailman3_web.py
@@ -32,10 +32,12 @@ def write_config():
 def initial_setup():
     db = unitdata.kv()
     chars = string.ascii_letters + string.digits
-    django_secret_key = ''.join((random.choice(chars)) for x in range(40))
-    hyperkitty_archiver_key = ''.join((random.choice(chars)) for x in range(40))
-    db.set('django_archiver_key', hyperkitty_archiver_key)
-    db.set('django_secret_key', django_secret_key)
+    if not db.get('django_secret_key'):
+        django_secret_key = ''.join((random.choice(chars)) for x in range(40))
+        db.set('django_secret_key', django_secret_key)
+    if not db.get('django_archiver_key'):
+        hyperkitty_archiver_key = ''.join((random.choice(chars)) for x in range(40))
+        db.set('django_archiver_key', hyperkitty_archiver_key)
     db.set('archiver_ip', hookenv.unit_get('private-address'))
     set_flag('mailman.configured')
 
@@ -47,6 +49,7 @@ def initial_setup():
 @when('apt.installed.apache2')
 @when_not('mailman.apache.configured')
 def configure_apache2():
+    hookenv.status_set('maintenance', 'updating apache2 configuration')
     render(source="mailman-apache.tmpl",
            target="/etc/apache2/conf-available/mailman.conf",
            context={})
@@ -70,6 +73,7 @@ def configure_apache2():
     # do SSL termination in front of this.
     hookenv.open_port(80)
     set_flag('mailman.apache.configured')
+    hookenv.status_set('active', 'ready')
 
 
 # Ask postgresql to create our DB.
@@ -98,7 +102,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')
 
 
 # We're providing a website relation to whatever does SSL termination in front
@@ -164,6 +170,8 @@ def clear_mailman3_relation():
 
 @when_any('endpoint.mailman3.connected')
 def changed_mailman_data():
+    if hookenv.hook_name() == 'update-status':
+        return
     clear_flag('mailman3.relation.configured')