Merge ~cjwatson/launchpad:charm-enable-more-services into launchpad:master

[Colin Watson]

charm: Enable appserver and convoy services

The charms already (re)started these services, but didn't tell systemd to enable them, so they didn't start again after a reboot.

[Guruprasad (lgp171188)]

LGTM 👍

review: Approve

diff --git a/charm/launchpad-appserver/reactive/launchpad-appserver.py b/charm/launchpad-appserver/reactive/launchpad-appserver.py
index de4d1d0..6179dc0 100644
--- a/charm/launchpad-appserver/reactive/launchpad-appserver.py
+++ b/charm/launchpad-appserver/reactive/launchpad-appserver.py
@@ -147,7 +147,8 @@ def configure():
 @when("coordinator.granted.restart")
 def restart():
     hookenv.log("Restarting application server")
-    host.service_restart("launchpad")
+    host.service_restart("launchpad.service")
+    host.service_resume("launchpad.service")
     set_state("service.configured")
 
 
diff --git a/charm/launchpad-assets/reactive/launchpad-assets.py b/charm/launchpad-assets/reactive/launchpad-assets.py
index ee2b74e..50fe2f8 100644
--- a/charm/launchpad-assets/reactive/launchpad-assets.py
+++ b/charm/launchpad-assets/reactive/launchpad-assets.py
@@ -107,6 +107,7 @@ def configure():
         check=True,
     )
     configure_convoy(config)
+    host.service_resume("convoy.socket")
     set_flag("service.configured")