Merge lp:~tcuthbert/mojo/mojo-specs-rt116682 into lp:mojo/mojo-specs

[Thomas Cuthbert]

autocert mojo.canonical.com, cRT#116682

[🤖 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 129

=== modified file 'mojo-how-to/manifest'
--- mojo-how-to/manifest	2015-05-21 09:49:32 +0000
+++ mojo-how-to/manifest	2019-02-04 04:37:06 +0000
@@ -8,6 +8,8 @@
 script config=pre-deploy
 # Deploy services only
 deploy config=services local=services-secret delay=0
+# Configure deploy autocert managed apache2
+script config=scripts/utils/configure-apache2-vhosts-autocert APPLICATION=apache2 HTTP_TEMPLATE=${MOJO_STAGE}/../templates/vhost-http.tmpl HTTPS_TEMPLATE=${MOJO_STAGE}/../templates/vhost-https.tmpl
 # Copy our built resources to the instances
 script config=upload-built-content
 # And now deploy relations as well

=== modified file 'mojo-how-to/production/collect'
--- mojo-how-to/production/collect	2016-11-14 15:36:25 +0000
+++ mojo-how-to/production/collect	2019-02-04 04:37:06 +0000
@@ -3,6 +3,7 @@
 
 
 # subordinates
+autocert                cs:~autocert-charmers/autocert
 content-fetcher         lp:~mthaddon/charms/trusty/content-fetcher/trunk
 nrpe                    lp:charms/trusty/nrpe
 landscape-client        cs:{{ series }}/landscape-client

=== modified file 'mojo-how-to/production/relations'
--- mojo-how-to/production/relations	2016-09-30 15:18:23 +0000
+++ mojo-how-to/production/relations	2019-02-04 04:37:06 +0000
@@ -14,3 +14,5 @@
     relations:
         - ["apache2", "content-fetcher"]
         - ["apache2:nrpe-external-master", "nrpe:nrpe-external-master"]
+        - ['apache2', 'autocert-apache2']
+        - ['autocert-apache2:nrpe-external-master', 'nrpe:nrpe-external-master']

=== modified file 'mojo-how-to/production/services'
--- mojo-how-to/production/services	2016-10-17 09:27:18 +0000
+++ mojo-how-to/production/services	2019-02-04 04:37:06 +0000
@@ -9,14 +9,13 @@
                 servername: mojo.canonical.com
                 enable_modules: "ssl"
                 nagios_check_http_params: -I 127.0.0.1 -H mojo.canonical.com -S -e '200' -s 'Mojo'
-                vhost_http_template: 'include-base64://{{spec_dir}}/{{stage}}/../configs/mojo-how-to-production-vhost-http.template'
-                vhost_https_template: 'include-base64://{{spec_dir}}/{{stage}}/../configs/mojo-how-to-production-vhost-https.template'
-                ssl_key: include-base64://{{local_dir}}/mojo.canonical.com.key
-                ssl_keylocation: mojo.canonical.com.key
-                ssl_cert: include-base64://{{local_dir}}/mojo.canonical.com.crt
-                ssl_certlocation: mojo.canonical.com.crt
-                ssl_chain: include-base64://{{local_dir}}/mojo.canonical.com_chain.crt
-                ssl_chainlocation: mojo.canonical.com_chain.crt
+        autocert-apache2:
+          charm: autocert
+          options:
+            autocert_host: autocert.canonical.com
+            service_action: reload
+            service_name: apache2
+            service_test_cmd: /usr/sbin/apache2ctl configtest
         content-fetcher:
             charm: content-fetcher
             options: