Merge ~pjdc/charm-k8s-mattermost/+git/charm-k8s-mattermost:siteurl into charm-k8s-mattermost:master

[Paul Collins]

add site_url and wire it up

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

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

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

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[Paul Collins (pjdc)]

Note prereq.

[Stuart Bishop (stub)]

Seems fine. Maybe the site_url option should be required, rather than 'optional but required if you want things to actually work'?

review: Approve

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

Merge proposal is approved, but source revision has changed, setting status to needs review.

[Paul Collins (pjdc)]

review: Approve (me)

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

Change successfully merged at revision 7ad6219bac991f15391b16d8392bf8c3596c143f

diff --git a/config.yaml b/config.yaml
index 603ba30..733c53d 100644
--- a/config.yaml
+++ b/config.yaml
@@ -7,3 +7,10 @@ options:
         type: boolean
         description: Allows users to sign up from the root page without an invite
         default: false
+    site_url:
+        type: string
+        description: |
+          The URL by which the site is reached.  This must be set for all of Mattermost's features to work correctly.
+
+          For more information, see https://docs.mattermost.com/administration/config-settings.html#site-url
+        default: ''
diff --git a/src/charm.py b/src/charm.py
index 0fcc304..230651c 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -110,6 +110,16 @@ class MattermostK8sCharm(CharmBase):
         mattermost_image_details = self.mattermost_image.fetch()
         self.model.unit.status = MaintenanceStatus('Configuring pod')
         config = self.model.config
+
+        pod_config = {
+            'MATTERMOST_HTTPD_LISTEN_PORT': int(config['mattermost_port']),
+            'MM_SQLSETTINGS_DATASOURCE': self.state.db_uri,
+            'MM_ENABLEOPENSERVER': config['open_server'],
+        }
+
+        if config['site_url']:
+            pod_config['MM_SERVICESETTINGS_SITEURL'] = config['site_url']
+
         self.model.pod.set_spec({
             'containers': [{
                 'name': self.framework.model.app.name,
@@ -118,11 +128,7 @@ class MattermostK8sCharm(CharmBase):
                     'containerPort': int(self.framework.model.config['mattermost_port']),
                     'protocol': 'TCP',
                 }],
-                'config': {
-                    'MATTERMOST_HTTPD_LISTEN_PORT': int(config['mattermost_port']),
-                    'MM_SQLSETTINGS_DATASOURCE': self.state.db_uri,
-                    'MM_ENABLEOPENSERVER': config['open_server'],
-                },
+                'config': pod_config,
             }]
         })
         self.state.is_started = True