From 9e102e2d1b9d6621b9c5d6ed0643432e8879f663 Mon Sep 17 00:00:00 2001 From: Dominik Kaminski Date: Mon, 18 Nov 2024 23:41:50 +0100 Subject: [PATCH] fix(element): Add extensive database options --- .../apps/element/values-synapse.yaml.gotmpl | 19 ++++++++++++++++++- helmfile/apps/openproject/values.yaml.gotmpl | 4 ++-- helmfile/environments/default/charts.yaml | 12 ++++++------ helmfile/environments/default/database.yaml | 15 +++++++++++++++ 4 files changed, 41 insertions(+), 9 deletions(-) diff --git a/helmfile/apps/element/values-synapse.yaml.gotmpl b/helmfile/apps/element/values-synapse.yaml.gotmpl index 814e6b59..6ba9b73b 100644 --- a/helmfile/apps/element/values-synapse.yaml.gotmpl +++ b/helmfile/apps/element/values-synapse.yaml.gotmpl @@ -27,9 +27,26 @@ configuration: database: host: {{ .Values.databases.synapse.host | quote }} + port: {{ .Values.databases.synapse.port }} name: {{ .Values.databases.synapse.name | quote }} user: {{ .Values.databases.synapse.username | quote }} - password: {{ .Values.databases.synapse.password | default .Values.secrets.postgresql.matrixUser | quote }} + password: + value: {{ .Values.databases.synapse.password | default .Values.secrets.postgresql.matrixUser | quote }} + requireAuth: {{ .Values.databases.synapse.requireAuth }} + channelBinding: {{ .Values.databases.synapse.channelBinding | quote }} + connectTimeout: {{ .Values.databases.synapse.connectTimeout }} + clientEncoding: {{ .Values.databases.synapse.clientEncoding | quote }} + keepalives: {{ .Values.databases.synapse.keepalives }} + keepalivesIdle: {{ .Values.databases.synapse.keepalivesIdle }} + keepalivesInterval: {{ .Values.databases.synapse.keepalivesInterval }} + keepalivesCount: {{ .Values.databases.synapse.keepalivesCount }} + replication: {{ .Values.databases.synapse.replication }} + gssencmode: {{ .Values.databases.synapse.gssencmode | quote }} + sslmode: {{ .Values.databases.synapse.sslmode | quote }} + sslcompression: {{ .Values.databases.synapse.sslcompression }} + sslMinProtocolVersion: {{ .Values.databases.synapse.sslMinProtocolVersion | quote }} + connectionPoolMin: {{ .Values.databases.synapse.connectionPoolMin }} + connectionPoolMax: {{ .Values.databases.synapse.connectionPoolMax }} homeserver: serverName: {{ .Values.global.matrixDomain | default .Values.global.domain }} diff --git a/helmfile/apps/openproject/values.yaml.gotmpl b/helmfile/apps/openproject/values.yaml.gotmpl index ebe056a6..39064849 100644 --- a/helmfile/apps/openproject/values.yaml.gotmpl +++ b/helmfile/apps/openproject/values.yaml.gotmpl @@ -192,8 +192,8 @@ s3: enabled: true directUploads: {{ .Values.objectstores.openproject.directUploads }} enableSignatureV4Streaming: {{ .Values.objectstores.openproject.enableSignatureV4Streaming }} - endpoint: {{ .Values.objectstores.openproject.endpoint | default (printf "https://%s.%s" .Values.global.hosts.minioApi .Values.global.domain) | quote }} - host: {{ .Values.objectstores.openproject.endpoint | default (printf "https://%s.%s" .Values.global.hosts.minioApi .Values.global.domain) | quote }} + endpoint: {{ printf "https://%s" (.Values.objectstores.openproject.endpoint | default (printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain)) | quote }} + host: {{ printf "https://%s" (.Values.objectstores.openproject.endpoint | default (printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain)) | quote }} pathStyle: {{ .Values.objectstores.openproject.pathStyle }} region: {{ .Values.objectstores.openproject.region | quote }} bucketName: {{ .Values.objectstores.openproject.bucket | quote }} diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml index 16255a69..bf16152c 100644 --- a/helmfile/environments/default/charts.yaml +++ b/helmfile/environments/default/charts.yaml @@ -89,8 +89,8 @@ charts: # upstreamRepository: "bmi/opendesk/components/platform-development/charts/opendesk-element/opendesk-element" registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-element" - name: "opendesk-element" - version: "3.4.1" + name: "opendesk-element-web" + version: "5.0.0" verify: true elementWellKnown: # providerCategory: "Platform" @@ -100,7 +100,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-element" name: "opendesk-well-known" - version: "3.4.1" + version: "5.0.0" verify: true home: # providerCategory: "Platform" @@ -390,7 +390,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-element" name: "opendesk-synapse" - version: "3.4.1" + version: "5.0.0" verify: true synapseCreateAccount: # providerCategory: "Platform" @@ -400,7 +400,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-element" name: "opendesk-synapse-create-account" - version: "3.4.1" + version: "5.0.0" verify: true synapseWeb: # providerCategory: "Platform" @@ -410,7 +410,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-element" name: "opendesk-synapse-web" - version: "3.4.1" + version: "5.0.0" verify: true xwiki: # providerCategory: "Supplier" diff --git a/helmfile/environments/default/database.yaml b/helmfile/environments/default/database.yaml index 7b41f943..b40007d6 100644 --- a/helmfile/environments/default/database.yaml +++ b/helmfile/environments/default/database.yaml @@ -45,6 +45,21 @@ databases: port: 5432 username: "matrix_user" password: "" + requireAuth: [] + channelBinding: "prefer" + connectTimeout: 10 + clientEncoding: "auto" + keepalives: 1 + keepalivesIdle: 10 + keepalivesInterval: 10 + keepalivesCount: 3 + replication: false + gssencmode: "prefer" + sslmode: "prefer" + sslcompression: 0 + sslMinProtocolVersion: "TLSv1.2" + connectionPoolMin: "3" + connectionPoolMax: "5" connectionLimit: ~ umsGuardianManagementApi: name: "guardianmanagementapi"