From 7f7eae8f99a6d8ad8085ad99c63af27b858ff9b7 Mon Sep 17 00:00:00 2001 From: Dominik Henneke Date: Tue, 29 Aug 2023 15:39:37 +0000 Subject: [PATCH] fix(element): Apply the global theme to Element --- .gitlab-ci.yml | 3 ++- helmfile/apps/element/helmfile.yaml | 9 +++++---- helmfile/apps/element/values-element.gotmpl | 7 +++++++ helmfile/apps/element/values-well-known.yaml | 7 +++++++ helmfile/apps/jitsi/helmfile.yaml | 4 ++-- helmfile/apps/openproject/values.yaml | 6 ++++-- helmfile/apps/xwiki/values.yaml | 1 + helmfile/environments/default/images.yaml | 4 ++-- 8 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 helmfile/apps/element/values-well-known.yaml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ee297cc..9cc4c9b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,8 @@ variables: description: "The name of namespaces to deploy to." value: "" CLUSTER: - description: "Define which cluster to use. Cluster must be defined in gitlab/environments.yaml of sovereign-workplace-env included above." + description: "Define which cluster to use. Cluster must be defined in gitlab/environments.yaml of + sovereign-workplace-env included above." value: "dev" BASE_DOMAIN: description: "Define the Cluster Base Domain." diff --git a/helmfile/apps/element/helmfile.yaml b/helmfile/apps/element/helmfile.yaml index 2223ab42..a6758ea2 100644 --- a/helmfile/apps/element/helmfile.yaml +++ b/helmfile/apps/element/helmfile.yaml @@ -10,28 +10,29 @@ repositories: releases: - name: "sovereign-workplace-element" chart: "sovereign-workplace-element-repo/sovereign-workplace-element" - version: "1.1.2" + version: "1.3.0" values: - "values-element.gotmpl" condition: "element.enabled" - name: "sovereign-workplace-well-known" chart: "sovereign-workplace-element-repo/sovereign-workplace-well-known" - version: "1.1.2" + version: "1.3.0" values: + - "values-well-known.yaml" - "values-well-known.gotmpl" condition: "element.enabled" - name: "sovereign-workplace-synapse-web" chart: "sovereign-workplace-element-repo/sovereign-workplace-synapse-web" - version: "1.1.2" + version: "1.3.0" values: - "values-synapse-web.gotmpl" condition: "element.enabled" - name: "sovereign-workplace-synapse" chart: "sovereign-workplace-element-repo/sovereign-workplace-synapse" - version: "1.1.2" + version: "1.3.0" values: - "values-synapse.gotmpl" condition: "element.enabled" diff --git a/helmfile/apps/element/values-element.gotmpl b/helmfile/apps/element/values-element.gotmpl index 878f089f..fc578e26 100644 --- a/helmfile/apps/element/values-element.gotmpl +++ b/helmfile/apps/element/values-element.gotmpl @@ -11,6 +11,10 @@ global: imagePullSecrets: {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }} +configuration: + additionalConfiguration: + logout_redirect_url: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/souvap/protocol/openid-connect/logout?client_id=matrix&post_logout_redirect_uri=https%3A%2F%2F{{ .Values.global.hosts.univentionCorporateServer }}.{{ .Values.global.domain }}" + image: registry: "{{ .Values.global.imageRegistry }}" repository: "{{ .Values.images.element.repository }}" @@ -24,6 +28,9 @@ ingress: enabled: "{{ .Values.ingress.tls.enabled }}" secretName: "{{ .Values.ingress.tls.secretName }}" +theme: + {{ .Values.theme | toYaml | nindent 2 }} + replicaCount: {{ .Values.replicas.element }} resources: diff --git a/helmfile/apps/element/values-well-known.yaml b/helmfile/apps/element/values-well-known.yaml new file mode 100644 index 00000000..fef329ed --- /dev/null +++ b/helmfile/apps/element/values-well-known.yaml @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS" +# SPDX-License-Identifier: Apache-2.0 +--- +configuration: + e2ee: + forceDisable: true +... diff --git a/helmfile/apps/jitsi/helmfile.yaml b/helmfile/apps/jitsi/helmfile.yaml index e8728429..c2a9fc67 100644 --- a/helmfile/apps/jitsi/helmfile.yaml +++ b/helmfile/apps/jitsi/helmfile.yaml @@ -5,8 +5,8 @@ repositories: - name: "jitsi-repo" oci: true url: >- - {{ env "PRIVATE_IMAGE_REGISTRY_URL" | - default "external-registry.souvap-univention.de/sovereign-workplace/souvap/tooling/charts/sovereign-workplace-jitsi" }} + {{ env "PRIVATE_IMAGE_REGISTRY_URL" | default + "external-registry.souvap-univention.de/sovereign-workplace/souvap/tooling/charts/sovereign-workplace-jitsi" }} releases: - name: "jitsi" chart: "jitsi-repo/sovereign-workplace-jitsi" diff --git a/helmfile/apps/openproject/values.yaml b/helmfile/apps/openproject/values.yaml index cc636eac..d539f063 100644 --- a/helmfile/apps/openproject/values.yaml +++ b/helmfile/apps/openproject/values.yaml @@ -46,7 +46,8 @@ environment: OPENPROJECT_SEED_LDAP_OPENDESK_SECURITY: "plain_ldap" OPENPROJECT_SEED_LDAP_OPENDESK_BINDUSER: "uid=ldapsearch_openproject,cn=users,dc=swp-ldap,dc=internal" OPENPROJECT_SEED_LDAP_OPENDESK_BASEDN: "dc=swp-ldap,dc=internal" - OPENPROJECT_SEED_LDAP_OPENDESK_FILTER: "(&(objectClass=opendeskProjectmanagementUser)(opendeskProjectmanagementEnabled=TRUE))" + OPENPROJECT_SEED_LDAP_OPENDESK_FILTER: + "(&(objectClass=opendeskProjectmanagementUser)(opendeskProjectmanagementEnabled=TRUE))" OPENPROJECT_SEED_LDAP_OPENDESK_SYNC__USERS: "true" OPENPROJECT_SEED_LDAP_OPENDESK_LOGIN__MAPPING: "uid" OPENPROJECT_SEED_LDAP_OPENDESK_FIRSTNAME__MAPPING: "givenName" @@ -54,7 +55,8 @@ environment: OPENPROJECT_SEED_LDAP_OPENDESK_MAIL__MAPPING: "mailPrimaryAddress" OPENPROJECT_SEED_LDAP_OPENDESK_ADMIN__MAPPING: "opendeskProjectmanagementAdmin" OPENPROJECT_SEED_LDAP_OPENDESK_GROUPFILTER_OPENDESK_BASE: "dc=swp-ldap,dc=internal" - OPENPROJECT_SEED_LDAP_OPENDESK_GROUPFILTER_OPENDESK_FILTER: "(&(objectClass=opendeskProjectmanagementGroup)(opendeskProjectmanagementEnabled=TRUE))" + OPENPROJECT_SEED_LDAP_OPENDESK_GROUPFILTER_OPENDESK_FILTER: + "(&(objectClass=opendeskProjectmanagementGroup)(opendeskProjectmanagementEnabled=TRUE))" OPENPROJECT_SEED_LDAP_OPENDESK_GROUPFILTER_OPENDESK_SYNC__USERS: "true" OPENPROJECT_SEED_LDAP_OPENDESK_GROUPFILTER_OPENDESK_GROUP__ATTRIBUTE: "cn" diff --git a/helmfile/apps/xwiki/values.yaml b/helmfile/apps/xwiki/values.yaml index 4d5a2e48..6316c90b 100644 --- a/helmfile/apps/xwiki/values.yaml +++ b/helmfile/apps/xwiki/values.yaml @@ -45,6 +45,7 @@ properties: "@brand-primary" # yamllint disable-line rule:line-length "property:xwiki:FlamingoThemes.Iceberg^FlamingoThemesCode.ThemeClass.lessCode": "'.navbar-default { background-color: white; border-bottom: 1px solid grey; height: 64px; } #menuview .navbar-brand img { padding: 5px; } div#companylogo { width: 96px; height: auto; padding-top: 6px; padding-left: 5px; } li#tmWorkplaceServices { padding-left: 16px; padding-top: 5px; } .navbar-right { padding-top: 8px; } button { background-color: #ffffff; } .drawer-nav, .drawer-brand { background-color: #ffffff; } #footerglobal { background-color: #ffffff; }'" + # yamllint disable-line rule:line-length # "property:xwiki:FlamingoThemes.Iceberg^FlamingoThemesCode.ThemeClass.lessCode": "'@list-group-active-border: @list-group-border; @gray-light: #727272; @text-muted: @gray; @xwiki-drawer-menu-item-hover-bg: @list-group-hover-bg; @xwiki-drawer-menu-item-hover-color: @list-group-link-hover-color; @well-bg: @body-bg; .navbar-default { background-color: #ffffff; border-bottom: 1px solid #dddddd !important; height: 64px; } #menuview .navbar-brand img { padding: 5px; } div#companylogo { width: 96px; height: auto; padding-top: 6px; padding-left: 5px; } li#tmWorkplaceServices { padding-left: 16px; padding-top: 5px; } .navbar-right { padding-top: 8px; } #globalsearch .btn { background-color: #ffffff; color: @brand-primary; }'" "property:xwiki:XWiki.AuthService.Configuration^XWiki.AuthService.ConfigurationClass.authService": "oidc" diff --git a/helmfile/environments/default/images.yaml b/helmfile/environments/default/images.yaml index 54f5e2bb..9f24956a 100644 --- a/helmfile/environments/default/images.yaml +++ b/helmfile/environments/default/images.yaml @@ -12,8 +12,8 @@ images: repository: "dovecot/dovecot" digest: "sha256:96d414aa3f6978669b417f6468c16313a54ee6143a4846870e9f0eda280806e7" element: - repository: "vectorim/element-web" - tag: "v1.11.35" + repository: "souvap/tooling/images/element-web@sha256" + tag: "16506bba9da546b1bf5896892f6f4afefea3d0f1d8ed93eae511212627a029b9" freshclam: repository: "clamav/clamav" tag: "1.1.0_base"