From ca84c991a9abc442a858b1577c5b4e7243cd946b Mon Sep 17 00:00:00 2001 From: Simon Aronsson Date: Thu, 31 Oct 2024 11:57:52 +0100 Subject: [PATCH 1/4] fix: shadow rendering (#138) --- workload/ui/index.html | 6 ++++-- workload/ui/ui.css | 10 +++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/workload/ui/index.html b/workload/ui/index.html index ef65995..57867e6 100755 --- a/workload/ui/index.html +++ b/workload/ui/index.html @@ -61,7 +61,8 @@

Applications

{{else}} diff --git a/workload/ui/ui.css b/workload/ui/ui.css index 74f6644..20a3bf5 100644 --- a/workload/ui/ui.css +++ b/workload/ui/ui.css @@ -4,10 +4,14 @@ border: 1px solid #d9d9d9; padding: 8px; border-radius: 100%; - } +} - .link-list { +.p-matrix__item { + border: 0; +} + +.link-list { list-style-type: none; margin: 0; padding: 0; - } \ No newline at end of file +} From 7c6dc61648d32c25b20ec05a5e850d799eb05cb4 Mon Sep 17 00:00:00 2001 From: Simon Aronsson Date: Thu, 31 Oct 2024 11:58:37 +0100 Subject: [PATCH 2/4] fix: redirect http to https when tls is enabled (#139) --- charm/src/charm.py | 1 + 1 file changed, 1 insertion(+) diff --git a/charm/src/charm.py b/charm/src/charm.py index 3fb543f..80013a6 100755 --- a/charm/src/charm.py +++ b/charm/src/charm.py @@ -68,6 +68,7 @@ def __init__(self, *args): charm=self, port=self._internal_port, strip_prefix=True, + redirect_https=True, scheme=lambda: urlparse(self._internal_url).scheme, ) self.framework.observe( From ac57308ab575d5161be889c2dfe0b49021a16582 Mon Sep 17 00:00:00 2001 From: Simon Aronsson Date: Thu, 31 Oct 2024 11:59:09 +0100 Subject: [PATCH 3/4] fix: remove unnecessary status update guard (#140) --- charm/src/charm.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/charm/src/charm.py b/charm/src/charm.py index 80013a6..00d7e2e 100755 --- a/charm/src/charm.py +++ b/charm/src/charm.py @@ -188,8 +188,7 @@ def _configure(self, items, push_certs: bool = False): logger.error(msg) return - if self.unit.is_leader(): - self._update_status(ActiveStatus()) + self._update_status(ActiveStatus()) def _update_pebble_layer(self) -> bool: current_layer = self.workload.get_plan() From 2236646a64f5d8c3beeca569af839b324f7542f5 Mon Sep 17 00:00:00 2001 From: Simon Aronsson Date: Thu, 31 Oct 2024 12:02:25 +0100 Subject: [PATCH 4/4] replace mattermost link with community matrix (#142) Signed-off-by: Simon Aronsson --- charm/config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charm/config.yaml b/charm/config.yaml index 5947424..1efb575 100644 --- a/charm/config.yaml +++ b/charm/config.yaml @@ -37,8 +37,8 @@ options: "category": "Social", "items": [ { - "name": "Mattermost", - "url": "https://chat.charmhub.io", + "name": "Ubuntu Matrix Community", + "url": "https://matrix.to/#/#community:ubuntu.com", "target": "_blank" }, { @@ -48,4 +48,4 @@ options: } ] } - ] \ No newline at end of file + ]