From 88ac2396e6888e0f28a80ceebaa0f51d2ba436ee Mon Sep 17 00:00:00 2001 From: Dominik Kaminski Date: Tue, 7 May 2024 18:56:13 +0200 Subject: [PATCH] fix(element): Provide certificate for alternative Synapse domain. --- docs/enhanced-configuration.md | 6 +++--- helmfile/apps/element/values-synapse.yaml.gotmpl | 2 ++ helmfile/apps/services/values-certificates.yaml.gotmpl | 1 + helmfile/environments/default/charts.yaml | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/enhanced-configuration.md b/docs/enhanced-configuration.md index 76c35782..397be354 100644 --- a/docs/enhanced-configuration.md +++ b/docs/enhanced-configuration.md @@ -9,6 +9,6 @@ SPDX-License-Identifier: Apache-2.0 The follownig enhanced configuration use cases are described in separate documents. -- Separate mail & Matrix domain -- Federation with external identity provider -- Matrix federation +- [Separate mail & Matrix domain](enhanced-configuration/separate-mail-matrix-domain.md) +- [Federation with external identity provider](enhanced-configuration/idp-federation.md) +- [Matrix federation](enhanced-configuration/matrix-federation.md) diff --git a/helmfile/apps/element/values-synapse.yaml.gotmpl b/helmfile/apps/element/values-synapse.yaml.gotmpl index c073316a..39c3fff4 100644 --- a/helmfile/apps/element/values-synapse.yaml.gotmpl +++ b/helmfile/apps/element/values-synapse.yaml.gotmpl @@ -113,4 +113,6 @@ replicaCount: {{ .Values.replicas.synapse }} resources: {{ .Values.resources.synapse | toYaml | nindent 2 }} +tls: + secretName: {{ if .Values.global.matrixDomain }}"opendesk-certificates-synapse-tls"{{ else }}"opendesk-certificates-tls"{{ end }} ... diff --git a/helmfile/apps/services/values-certificates.yaml.gotmpl b/helmfile/apps/services/values-certificates.yaml.gotmpl index 6d5778ce..c03835c5 100644 --- a/helmfile/apps/services/values-certificates.yaml.gotmpl +++ b/helmfile/apps/services/values-certificates.yaml.gotmpl @@ -5,6 +5,7 @@ SPDX-License-Identifier: Apache-2.0 --- global: domain: {{ .Values.global.domain | quote }} + synapseDomain: {{ .Values.global.matrixDomain | quote }} hosts: {{ .Values.global.hosts | toYaml | nindent 4 }} diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml index 62318003..ce2aad94 100644 --- a/helmfile/environments/default/charts.yaml +++ b/helmfile/environments/default/charts.yaml @@ -14,7 +14,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-certificates" name: "opendesk-certificates" - version: "2.1.3" + version: "2.2.0" verify: true clamav: # providerCategory: 'Platform'