From a31c5f59a68e90ba9e80350ebd5827e7b05d4ef5 Mon Sep 17 00:00:00 2001 From: Gergely Szabo Date: Wed, 29 May 2024 10:17:23 +0200 Subject: [PATCH] fix(univention-management-stack): Add functional switch to disable deployment information. --- helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl | 8 ++++++-- .../values-umbrella.yaml.gotmpl | 2 ++ helmfile/environments/default/functional.yaml | 4 ++++ helmfile/environments/default/secrets.gotmpl | 8 +++++--- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl index b68d8317..bb6f9a78 100644 --- a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl +++ b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl @@ -5,6 +5,10 @@ SPDX-License-Identifier: Apache-2.0 --- global: hostname: "{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}" + appsuite: + cookieHashSalt: {{ .Values.secrets.oxAppsuite.cookieHashSalt }} + shareCryptKey: {{ .Values.secrets.oxAppsuite.shareCryptKey }} + sessiondEncryptionKey: {{ .Values.secrets.oxAppsuite.sessiondEncryptionKey }} mysql: host: {{ .Values.databases.oxAppsuite.host | quote }} database: {{ .Values.databases.oxAppsuite.name | quote }} @@ -98,8 +102,8 @@ appsuite: pageHeaderPrefix: "as8.souvap App Suite" oidcLogin: true oidcPath: "/oidc" - masterAdmin: "masteradmin" - masterPassword: {{ .Values.secrets.oxAppsuite.masterAdminPassword | quote }} + masterAdmin: "admin" + masterPassword: {{ .Values.secrets.oxAppsuite.adminPassword | quote }} hzGroupName: "hzgroup" hzGroupPassword: {{ .Values.secrets.oxAppsuite.hzGroupPassword | quote }} basicAuthLogin: "oxlogin" diff --git a/helmfile/apps/univention-management-stack/values-umbrella.yaml.gotmpl b/helmfile/apps/univention-management-stack/values-umbrella.yaml.gotmpl index f03a3bc9..ee99d611 100644 --- a/helmfile/apps/univention-management-stack/values-umbrella.yaml.gotmpl +++ b/helmfile/apps/univention-management-stack/values-umbrella.yaml.gotmpl @@ -674,9 +674,11 @@ stack-data-swp: stackDataSwp: udmApiPassword: {{ .Values.secrets.univentionManagementStack.ldapSecret | quote }} + {{- if .Values.portal.enableDeploymentInformation }} systemInformation: deployDate: "Deployed: {{ now | date "2006-01-02T15:04:05-0700" }}" releaseVersion: "Release: {{ .Values.global.systemInformation.releaseVersion }}" + {{- end }} udmApiUser: "cn=admin" udmApiUrl: "http://ums-udm-rest-api/udm/" loadDevData: true diff --git a/helmfile/environments/default/functional.yaml b/helmfile/environments/default/functional.yaml index 69b6d97e..d15e68c3 100644 --- a/helmfile/environments/default/functional.yaml +++ b/helmfile/environments/default/functional.yaml @@ -16,4 +16,8 @@ externalServices: matrix: federation: enabled: true + +portal: + # Display deployment release and date in portal for admins. + enableDeploymentInformation: true ... diff --git a/helmfile/environments/default/secrets.gotmpl b/helmfile/environments/default/secrets.gotmpl index c0f17b38..f75152c3 100644 --- a/helmfile/environments/default/secrets.gotmpl +++ b/helmfile/environments/default/secrets.gotmpl @@ -7,15 +7,17 @@ SPDX-License-Identifier: Apache-2.0 secrets: oxAppsuite: adminPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ox_appsuite" "admin_password" | sha1sum | quote }} - masterAdminPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ox_appsuite" "master_admin_password" | sha1sum | quote }} cookieHashSalt: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ox_appsuite" "cookie_hash_salt" | sha1sum | quote }} sessiondEncryptionKey: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ox_appsuite" "sessiond_encryptionkey" | sha1sum | quote }} shareCryptKey: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ox_appsuite" "share_cryptkey" | sha1sum | quote }} - oxguardMC: {{ printf "MC%s" (randAlphaNum 20 | b64enc) | quote }} - oxguardRC: {{ printf "RC%s" (randAlphaNum 20 | b64enc) | quote }} + oxguardMC: {{ printf "MC%s" (derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ox_appsuite" "oxguardMC" | sha1sum | trunc 20 | b64enc) | quote }} + oxguardRC: {{ printf "RC%s" (derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ox_appsuite" "oxguardRC" | sha1sum | trunc 20 | b64enc) | quote }} hzGroupPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ox_appsuite" "hz_group_password" | sha1sum | quote }} basicAuthPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ox_appsuite" "basic_auth_password" | sha1sum | quote }} jolokiaPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ox_appsuite" "jolokia_password" | sha1sum | quote }} + cookieHashSalt: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ox_appsuite" "cookie_hash_salt" | sha1sum | quote }} + shareCryptKey: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ox_appsuite" "share_crypt_key" | sha1sum | quote }} + sessiondEncryptionKey: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ox_appsuite" "sessiond_encryption_key" | sha1sum | quote }} univentionManagementStack: ldapSecret: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "cn=admin" "ldap" | sha1sum | quote }} ldapSearch: