fix(helmfile): Add opendesk-static-files to opendesk-services to serve favicons

REUSE.toml

@@ -14,7 +14,7 @@ SPDX-FileCopyrightText = "2023 Bundesministerium des Innern und für Heimat, PG
 SPDX-License-Identifier = "CC0-1.0"
 
 [[annotations]]
-path = "helmfile/files/theme/*"
+path = "helmfile/files/theme/**"
 SPDX-FileCopyrightText = "2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH"
 SPDX-License-Identifier = "Apache-2.0"
 

cspell.json

@@ -4,79 +4,81 @@
     "dictionaryDefinitions": [],
     "dictionaries": [],
     "words": [
-        "openDesk",
+        "Addressbooks",
         "AppSuite",
-        "Collabora",
-        "Digitale",
-        "Jitsi",
-        "Nextcloud",
-        "Öffentlichen",
-        "OpenProject",
-        "Souveränität",
-        "Verwaltung",
-        "Zentrum",
-        "Keycloak",
-        "NATS",
-        "slapadd",
-        "slapcat",
-        "RDBMS",
-        "Velero",
-        "Univention",
-        "OIDC",
-        "kcadmin",
-        "DMARC",
-        "homeserver",
-        "Bundesministerium",
-        "Innern",
-        "Heimat",
-        "Projektgruppe",
+        "Arbeitsplatz",
         "Aufbau",
-        "Filepicker",
-        "Weboffice",
-        "Xchange",
-        "opencode",
-        "seccomp",
-        "psql",
-        "databasename",
-        "helmfile",
-        "gotmpl",
-        "containerd",
-        "letsencrypt",
-        "CNCF",
-        "kubespray",
-        "ICAP",
+        "bootstrap",
+        "Bundesministerium",
         "Ceph",
+        "clamav",
+        "CNCF",
+        "Collabora",
+        "commandline",
+        "configurability",
+        "containerd",
         "Coturn",
-        "Minio",
-        "Kyverno",
-        "Otterize",
-        "IBAC",
-        "pubkeys",
-        "Grundschutz",
-        "Kubescape",
-        "Gitflow",
-        "hadolint",
+        "cryptpad",
+        "databasename",
+        "Digitale",
+        "DMARC",
         "explorative",
+        "Filepicker",
+        "filestore",
+        "Gitflow",
+        "gotmpl",
+        "Grundschutz",
+        "hadolint",
+        "Heimat",
+        "helmfile",
+        "helmfiles",
+        "homeserver",
+        "IBAC",
+        "ICAP",
+        "IMAPS",
+        "Innern",
+        "Jitsi",
+        "kcadmin",
+        "Keycloak",
+        "Kubescape",
+        "kubespray",
+        "Kyverno",
+        "letsencrypt",
+        "localpart",
+        "Minio",
+        "NATS",
+        "Nextcloud",
+        "nindent",
         "Nordeck",
         "Nubus",
-        "Souveräne",
-        "Arbeitsplatz",
-        "commandline",
-        "helmfiles",
-        "SMTPS",
-        "IMAPS",
-        "xwiki",
-        "cryptpad",
-        "clamav",
-        "templating",
-        "localpart",
-        "Addressbooks",
-        "filestore",
-        "trashbin",
-        "bootstrap",
-        "configurability",
+        "Öffentlichen",
+        "OIDC",
+        "opencode",
+        "openDesk",
+        "OpenProject",
+        "Otterize",
+        "Projektgruppe",
+        "psql",
+        "pubkeys",
+        "RDBMS",
+        "seccomp",
         "selfsigned",
-        "truststore"
+        "slapadd",
+        "slapcat",
+        "SMTPS",
+        "Souveräne",
+        "Souveränität",
+        "templating",
+        "trashbin",
+        "truststore",
+        "Univention",
+        "Velero",
+        "Verwaltung",
+        "Videokonferenz",
+        "Weboffice",
+        "Xchange",
+        "xwiki",
+        "Zentrum"
     ],
     "ignoreWords": [],
     "import": []

docs/migrations.md

@@ -11,6 +11,7 @@ SPDX-License-Identifier: Apache-2.0
 * [Releases upgrade details](#releases-upgrade-details)
   * [From v1.0.0](#from-v100)
     * [Pre-upgrade: Manual checks/steps from v1.0.0](#pre-upgrade-manual-checkssteps-from-v100)
+      * [Helmfile Cleanup: Restructured `/helmfile/files/theme` folder](#helmfile-cleanup-restructured-helmfilefilestheme-folder)
       * [Helmfile Cleanup: Consistent use of `*.yaml.gotmpl`](#helmfile-cleanup-consistent-use-of-yamlgotmpl)
       * [Helmfile Cleanup: Prefixing certain app directories with `opendesk-`](#helmfile-cleanup-prefixing-certain-app-directories-with-opendesk-)
       * [Helmfile Cleanup: Helmfile Cleanup: Splitting external vs. openDesk services](#helmfile-cleanup-helmfile-cleanup-splitting-external-vs-opendesk-services)
@@ -76,6 +77,10 @@ Explanation of the table's columns:
 
 ### Pre-upgrade: Manual checks/steps from v1.0.0
 
+#### Helmfile Cleanup: Restructured `/helmfile/files/theme` folder
+
+If you make use of the [theme folder](../helmfile/files/theme/) or the [`theme.yaml.gotmpl`](../helmfile/environments/default/theme.yaml.gotmpl), e.g. to applying your own imagery, please ensure you adhere to the new structure of the folder and the yaml-file.
+
 #### Helmfile Cleanup: Consistent use of `*.yaml.gotmpl`
 
 In v1.0.0 the files in [`/helmfile/environments/default`](../helmfile/environments/default/) had mixed extensions,

helmfile/apps/element/helmfile-child.yaml.gotmpl

@@ -112,15 +112,9 @@ repositories:
     url: "{{ .Values.global.helmRegistry | default .Values.charts.synapsePipe.registry }}/{{ .Values.charts.synapsePipe.repository }}"
 
 releases:
-  # During upgrade 1.0.0 -> 1.1.0 the chart 'opendesk-element' has been moved to 'opendesk-element-web'
   - name: "opendesk-element"
     chart: "element-repo/{{ .Values.charts.element.name }}"
     version: "{{ .Values.charts.element.version }}"
-    installed: false
-
-  - name: "opendesk-element-web"
-    chart: "element-repo/{{ .Values.charts.elementWeb.name }}"
-    version: "{{ .Values.charts.elementWeb.version }}"
     values:
       - "values-element.yaml.gotmpl"
       {{ range .Values.customization.release.opendeskElement }}

helmfile/apps/element/values-element.yaml.gotmpl

@@ -149,6 +149,7 @@ resources:
   {{ .Values.resources.element | toYaml | nindent 2 }}
 
 theme:
+  title: "Chat - {{ .Values.theme.texts.productName }}"
   {{ .Values.theme | toYaml | nindent 2 }}
 
 ...

helmfile/apps/jitsi/values-jitsi.yaml.gotmpl

@@ -63,6 +63,7 @@ settings:
   keycloakClientId: "opendesk-jitsi"
 
 theme:
+  title: "Videokonferenz - {{ .Values.theme.texts.productName }}"
   {{ .Values.theme | toYaml | nindent 2 }}
 
 jitsi:

helmfile/apps/nubus/values-nubus.yaml.gotmpl

@@ -423,7 +423,7 @@ nubusStackDataUms:
     umcMemcachedHostname: {{ .Values.cache.umsSelfservice.host | quote }}
     umcMemcachedUsername: ""
     externalMailDomain: {{ .Values.global.mailDomain | default .Values.global.domain }}
-    umcHtmlTitle: "openDesk Portal"
+    umcHtmlTitle: "Portal - {{ .Values.theme.texts.productName }}"
     smtpHost: {{ printf "%s.%s.svc.%s" "postfix" (.Values.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
     smtpPort: 25
     smtpUser: ""
@@ -443,8 +443,8 @@ nubusStackDataUms:
     portalGroupwareLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.openxchange .Values.global.domain }}
     portalFileshareLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.nextcloud .Values.global.domain }}
     portalNotesLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.notes .Values.global.domain }}
-    portalTitleDE: "openDesk Portal"
-    portalTitleEN: "openDesk Portal"
+    portalTitleDE: "Portal - {{ .Values.theme.texts.productName }}"
+    portalTitleEN: "Portal - {{ .Values.theme.texts.productName }}"
     oxDefaultContext: "1"
     componentEnabled:
       notes: {{ .Values.notes.enabled }}
@@ -526,7 +526,7 @@ nubusUmcServer:
 
 nubusUmcGateway:
   umcGateway:
-    umcHtmlTitle: "openDesk Portal"
+    umcHtmlTitle: "Portal - {{ .Values.theme.texts.productName }}"
   ingress:
     certManager:
       enabled: false

helmfile/apps/nubus/values-opendesk-customization.yaml.gotmpl

@@ -516,12 +516,12 @@ nubusPortalFrontend:
     {{ .Values.resources.umsPortalFrontend | toYaml | nindent 4 }}
   portalFrontend:
     branding:
-      css: {{ .Values.theme.styles.portalCss | toJson }}
+      css: {{ .Values.theme.styles.portal.main | toJson }}
       # Requires .ico, .svg does not work.
-      favicon: {{ .Values.theme.imagery.faviconIcoB64 | toJson }}
+      favicon: {{ .Values.theme.imagery.portal.faviconIco | toJson }}
       # The actual `logo` is set in customizing image, the logo down here is for for waiting spinner.
-      logo: {{ .Values.theme.imagery.portalWaitingSpinnerSvgB64 | toJson }}
-      backgroundImage: {{ .Values.theme.imagery.portalLogoBackgroundSvgB64 | toJson }}
+      logo: {{ .Values.theme.imagery.portal.waitingSpinnerSvg | toJson }}
+      backgroundImage: {{ .Values.theme.imagery.portal.logoBackgroundSvg | toJson }}
 
 nubusStackDataUms:
   containerSecurityContext:

helmfile/apps/opendesk-services/helmfile-child.yaml.gotmpl

@@ -44,7 +44,7 @@ repositories:
 
     # openDesk Grafana Dashboards
     # https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-dashboards
-  - name: "dashboards-repo"
+  - name: "opendesk-dashboards-repo"
     keyring: "../../files/gpg-pubkeys/opencode.gpg"
     verify: {{ .Values.charts.opendeskDashboards.verify }}
     username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
@@ -52,6 +52,16 @@ repositories:
     oci: true
     url: "{{ .Values.global.helmRegistry | default .Values.charts.opendeskDashboards.registry }}/{{ .Values.charts.opendeskDashboards.repository }}"
 
+    # openDesk Static Files
+  # https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-static-files
+  - name: "opendesk-static-files-repo"
+    keyring: "../../files/gpg-pubkeys/opencode.gpg"
+    verify: {{ .Values.charts.opendeskStaticFiles.verify }}
+    username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
+    password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
+    oci: true
+    url: "{{ .Values.global.helmRegistry | default .Values.charts.opendeskStaticFiles.registry }}/{{ .Values.charts.opendeskStaticFiles.repository }}"
+
 releases:
   - name: "opendesk-otterize"
     chart: "otterize-repo/{{ .Values.charts.otterize.name }}"
@@ -97,14 +107,23 @@ releases:
     timeout: 900
 
   - name: "opendesk-dashboards"
-    chart: "dashboards-repo/{{ .Values.charts.opendeskDashboards.name }}"
+    chart: "opendesk-dashboards-repo/{{ .Values.charts.opendeskDashboards.name }}"
     version: "{{ .Values.charts.opendeskDashboards.version }}"
     values:
-      - "values-dashboards.yaml.gotmpl"
+      - "values-opendesk-dashboards.yaml.gotmpl"
       - {{ .Values.customization.release.opendeskDashboards | default "additionalValues: false" }}
     installed: {{ .Values.monitoring.grafana.dashboards.enabled }}
     timeout: 900
 
+  - name: "opendesk-static-files"
+    chart: "opendesk-static-files-repo/{{ .Values.charts.opendeskStaticFiles.name }}"
+    version: "{{ .Values.charts.opendeskStaticFiles.version }}"
+    values:
+      - "values-opendesk-static-files.yaml.gotmpl"
+      - {{ .Values.customization.release.opendeskStaticFiles | default "additionalValues: false" }}
+    installed: {{ .Values.staticFiles.enabled }}
+    timeout: 900
+
 commonLabels:
   deployStage: "030-opendesk-services"
   component: "opendesk-services"

helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl

@@ -0,0 +1,107 @@
+{{/*
+SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-License-Identifier: Apache-2.0
+*/}}
+---
+global:
+  domain: {{ .Values.global.domain | quote }}
+  hosts:
+    {{ .Values.global.hosts | toYaml | nindent 4 }}
+  imagePullSecrets:
+    {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
+
+cleanup:
+  deletePodsOnSuccess: {{ .Values.debug.cleanup.deletePodsOnSuccess }}
+  deletePodsOnSuccessTimeout: {{ .Values.debug.cleanup.deletePodsOnSuccessTimeout }}
+
+containerSecurityContext:
+  allowPrivilegeEscalation: false
+  capabilities:
+    drop:
+      - "ALL"
+  enabled: true
+  runAsUser: 101
+  runAsGroup: 101
+  seccompProfile:
+    type: "RuntimeDefault"
+  readOnlyRootFilesystem: true
+  runAsNonRoot: true
+  seLinuxOptions:
+    {{ .Values.seLinuxOptions.opendeskStaticFiles | toYaml | nindent 4 }}
+
+ingress:
+  ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
+  host: "{{ .Values.global.hosts.static }}.{{ .Values.global.domain }}"
+  tls:
+    secretName: {{ .Values.ingress.tls.secretName | quote }}
+
+image:
+  registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.opendeskStaticFiles.registry | quote }}
+  repository: {{ .Values.images.opendeskStaticFiles.repository | quote }}
+  tag: {{ .Values.images.opendeskStaticFiles.tag | quote }}
+  imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
+
+
+podSecurityContext:
+  enabled: true
+  fsGroup: 101
+  fsGroupChangePolicy: "Always"
+
+replicaCount: {{ .Values.replicas.opendeskStaticFiles }}
+
+resources:
+  {{ .Values.resources.opendeskStaticFiles | toYaml | nindent 2 }}
+
+service:
+  type: "ClusterIP"
+
+theme:
+  imagery:
+    assets:
+      element:
+        subdomain: {{ .Values.global.hosts.element }}
+        paths:
+          - path: "/vector-icons/favicon.........ico"
+            data: {{ .Values.theme.imagery.chat.faviconIco }}
+      jitsi:
+        subdomain: {{ .Values.global.hosts.jitsi }}
+        paths:
+          - path: "/images/favicon.svg"
+            data: {{ .Values.theme.imagery.videoconference.faviconSvg }}
+      keycloak:
+        subdomain: {{ .Values.global.hosts.keycloak }}
+        paths:
+          - path: "/resources/...../login/UCS/img/favicon.ico"
+            data: {{ .Values.theme.imagery.portal.faviconIco }}
+      nextcloud:
+        subdomain: {{ .Values.global.hosts.nextcloud }}
+        paths:
+          - path: "/core/img/favicon-touch.png"
+            data: {{ .Values.theme.imagery.files.faviconPng }}
+          - path: "/core/img/favicon.ico"
+            data: {{ .Values.theme.imagery.files.faviconIco }}
+      openproject:
+        subdomain: {{ .Values.global.hosts.openproject }}
+        paths:
+          - path: "/custom_style/........../favicon/favicon.svg"
+            data: {{ .Values.theme.imagery.projects.faviconSvg }}
+      openxchange:
+        subdomain: {{ .Values.global.hosts.openxchange }}
+        paths:
+          - path: "/appsuite/favicon.ico"
+            data: {{ .Values.theme.imagery.groupware.faviconIco }}
+          - path: "/appsuite/favicon.svg"
+            data: {{ .Values.theme.imagery.groupware.faviconSvg }}
+      portal:
+        subdomain: {{ .Values.global.hosts.nubus }}
+        paths:
+          - path: "/favicon.ico"
+            data: {{ .Values.theme.imagery.portal.faviconIco }}
+      xwiki:
+        subdomain: {{ .Values.global.hosts.xwiki }}
+        paths:
+          - path: "/resources/icons/xwiki/favicon.svg"
+            data: {{ .Values.theme.imagery.knowledge.faviconSvg }}
+          - path: "/resources/icons/xwiki/favicon16.png"
+            data: {{ .Values.theme.imagery.knowledge.faviconPng }}
+...

helmfile/apps/openproject/values.yaml.gotmpl

@@ -40,7 +40,7 @@ dbInit:
 environment:
 # For more details and more options see
 # https://www.openproject.org/docs/installation-and-operations/configuration/environment/
-  OPENPROJECT_APP__TITLE: "Projects | {{ .Values.theme.texts.productName }}"
+  OPENPROJECT_APP__TITLE: "Projekte - {{ .Values.theme.texts.productName }}"
   OPENPROJECT_LOG__LEVEL: {{ if .Values.debug.enabled }}"debug"{{ else }}"info"{{ end }}
   OPENPROJECT_LOGIN__REQUIRED: "true"
   OPENPROJECT_USER__DEFAULT__TIMEZONE: "Europe/Berlin"

helmfile/apps/xwiki/values.yaml.gotmpl

@@ -141,9 +141,6 @@ postgresql:
 
 properties:
   "attachment:xwiki:FlamingoThemes.Iceberg@logo.svg": "data:image/svg+xml;base64,{{ .Values.theme.imagery.logoHeaderSvgB64 }}"
-  "attachment:xwiki:XWiki.DefaultSkin@icons.xwiki.favicon.svg": "data:image/svg+xml;base64,{{ .Values.theme.imagery.faviconSvgB64 }}"
-  "attachment:xwiki:XWiki.DefaultSkin@icons.xwiki.favicon16.png": "data:image/png;base64,{{ .Values.theme.imagery.favicon16PngB64 }}"
-  "attachment:xwiki:XWiki.DefaultSkin@icons.xwiki.favicon144.png": "data:image/png;base64,{{ .Values.theme.imagery.favicon144PngB64 }}"
   "property:xwiki:XWiki.XWikiServerXwiki^XWiki.XWikiServerClass.secure": 1
   "property:xwiki:XWiki.XWikiServerXwiki^XWiki.XWikiServerClass.server": "{{ .Values.global.hosts.xwiki }}.{{ .Values.global.domain }}"
   "property:xwiki:XWiki.XWikiServerXwiki^XWiki.XWikiServerClass.port": 443
@@ -193,7 +190,7 @@ properties:
   ## LDAP filter to only synchronize some groups
   "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.ldapGroupImportSearchFilter":
     "(&(objectClass=opendeskKnowledgemanagementGroup)(opendeskKnowledgemanagementEnabled=TRUE))"
-  "property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.title": "{{ .Values.theme.texts.productName }} Wissen - $!tdoc.displayTitle"
+  "property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.title": "Wissen - $!tdoc.displayTitle - {{ .Values.theme.texts.productName }}"
 
 cluster:
   replicas: {{ .Values.replicas.xwiki }}

helmfile/environments/default/charts.yaml.gotmpl

@@ -21,7 +21,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-certificates"
     name: "opendesk-certificates"
-    version: "3.1.0"
+    version: "3.1.1"
     verify: true
   clamav:
     # providerCategory: "Platform"
@@ -104,7 +104,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-element"
     name: "opendesk-element"
-    version: "5.0.1"
+    version: "6.0.0"
     verify: true
   elementWeb:
     # providerCategory: "Platform"
@@ -114,7 +114,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-element"
     name: "opendesk-element-web"
-    version: "5.0.1"
+    version: "6.0.0"
     verify: true
   elementWellKnown:
     # providerCategory: "Platform"
@@ -124,7 +124,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-element"
     name: "opendesk-well-known"
-    version: "5.0.1"
+    version: "6.0.0"
     verify: true
   home:
     # providerCategory: "Platform"
@@ -156,7 +156,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-jitsi"
     name: "opendesk-jitsi"
-    version: "2.1.1"
+    version: "3.0.1"
     verify: true
   mariadb:
     # providerCategory: "Platform"
@@ -216,7 +216,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-element"
     name: "opendesk-matrix-user-verification-service"
-    version: "5.0.1"
+    version: "6.0.1"
     verify: true
   memcached:
     # providerCategory: "Community"
@@ -340,6 +340,16 @@ charts:
     name: "opendesk-keycloak-bootstrap"
     version: "2.2.0"
     verify: true
+  opendeskStaticFiles:
+    # providerCategory: "Platform"
+    # providerResponsible: "openDesk"
+    # upstreamRegistry: "https://registry.opencode.de"
+    # upstreamRepository: "bmi/opendesk/components/platform-development/charts/opendesk-static-files/opendesk-static-files"
+    registry: "registry.opencode.de"
+    repository: "bmi/opendesk/components/platform-development/charts/opendesk-static-files"
+    name: "opendesk-static-files"
+    version: "3.0.1"
+    verify: true
   openproject:
     # providerCategory: "Supplier"
     # providerResponsible: "openProject"
@@ -444,7 +454,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-element"
     name: "opendesk-synapse"
-    version: "5.0.1"
+    version: "6.0.1"
     verify: true
   synapseAdmin:
     # Component is required for openDesk Enterprise only.
@@ -468,7 +478,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-element"
     name: "opendesk-synapse-create-account"
-    version: "5.0.1"
+    version: "6.0.0"
     verify: true
   synapseGroupsync:
     # Component is required for openDesk Enterprise only.
@@ -492,7 +502,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-element"
     name: "opendesk-synapse-web"
-    version: "5.0.1"
+    version: "6.0.0"
     verify: true
   xwiki:
     # providerCategory: "Supplier"

helmfile/environments/default/customization.yaml.gotmpl

@@ -50,12 +50,16 @@ customization:
     openproject: {}
     # openproject-bootstrap
     opendeskOpenprojectBootstrap: {}
-    # services
+    # xwiki
+    xwiki: {}
+    # openDesk services
     opendeskOtterize: {}
     opendeskHome: {}
     opendeskCertificates: {}
     opendeskAlerts: {}
     opendeskDashboards: {}
+    opendeskStaticFiles: {}
+    # external services
     redis: {}
     memcached: {}
     postgresql: {}
@@ -65,8 +69,6 @@ customization:
     clamav: {}
     clamavSimple: {}
     minio: {}
-    # xwiki
-    xwiki: {}
 
     # openDesk Enterprise Components
     cassandra: {}

helmfile/environments/default/debug.yaml.gotmpl

@@ -7,9 +7,9 @@ debug:
     deletePodsOnSuccess: true
     # When deletePodsOnSuccess is enabled, the pod will be deleted after configured seconds.
     deletePodsOnSuccessTimeout: 60
-    # Keep persistence on deletion of this release.
+    # Keep persistence on deletion of a release.
     keepPVCOnDelete: false
-    # Keep additional resources, like certificates on deletion of this release.
+    # Keep additional resources, like certificates on deletion of a release.
     keepRessourceOnDelete: true
   # should activate debug output in all components and even allow e.g. successfully executed jobs
   # to stay available. This is going to be implemented on a case by case basis when we actually

helmfile/environments/default/global.yaml.gotmpl

@@ -48,6 +48,7 @@ global:
     nubus: "portal"
     openproject: "projects"
     openxchange: "webmail"
+    static: "static"
     synapse: "matrix"
     synapseFederation: "matrix-federation"
     whiteboard: "whiteboard"

helmfile/environments/default/images.yaml.gotmpl

@@ -628,6 +628,14 @@ images:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/images/opendesk-keycloak-bootstrap"
     tag: "1.2.1@sha256:f5ce0be27580c6347c5e700c4fa271a811d45d8a0e4b40ffe8a4d0e3d47e670f"
+  opendeskStaticFiles:
+    # providerCategory: "Community"
+    # providerResponsible: "Element"
+    # upstreamRegistry: "https://registry-1.docker.io"
+    # upstreamRepository: "library/nginx"
+    registry: "registry-1.docker.io"
+    repository: "library/nginx"
+    tag: "1.27.3-alpine3.20@sha256:41523187cf7d7a2f2677a80609d9caa14388bf5c1fbca9c410ba3de602aaaab4"
   openproject:
     # providerCategory: "Supplier"
     # providerResponsible: "OpenProject"
@@ -859,7 +867,7 @@ images:
     # upstreamRepository: "library/nginx"
     registry: "registry-1.docker.io"
     repository: "library/nginx"
-    tag: "1.27.0-bookworm@sha256:1445eb9c6dc5e9619346c836ef6fbd6a95092e4663f27dcfce116f051cdbd232"
+    tag: "1.27.3-alpine3.20@sha256:41523187cf7d7a2f2677a80609d9caa14388bf5c1fbca9c410ba3de602aaaab4"
   xwiki:
     # providerCategory: "Supplier"
     # providerResponsible: "XWiki"

helmfile/environments/default/opendesk_main.yaml.gotmpl

@@ -70,6 +70,9 @@ postgresql:
 redis:
   enabled: true
   namespace: ~
+staticFiles:
+  enabled: true
+  namespace: ~
 xwiki:
   enabled: true
   namespace: ~

helmfile/environments/default/replicas.yaml.gotmpl

@@ -155,6 +155,10 @@ replicas:
   # -- scalable: true
   nextcloudExporter: 1
 
+  # -- component: openDesk Static Files
+  # -- scalable: true
+  opendeskStaticFiles: 1
+
   # -- component: Project management (OpenProject)
   # -- scalable: true
   openprojectWeb: 1

helmfile/environments/default/resources.yaml.gotmpl

@@ -134,6 +134,13 @@ resources:
     requests:
       cpu: 0.1
       memory: "256Mi"
+  opendeskStaticFiles:
+    limits:
+      cpu: 99
+      memory: "64Mi"
+    requests:
+      cpu: 0.01
+      memory: "16Mi"
   umsKeycloak:
     limits:
       cpu: 99

helmfile/environments/default/selinux.yaml.gotmpl

@@ -41,6 +41,7 @@ seLinuxOptions:
   notesFrontend: ~
   notesYProvider: ~
   opendeskKeycloakBootstrap: ~
+  opendeskStaticFiles: ~
   openproject: ~
   openprojectBootstrap: ~
   openprojectDbInit: ~

helmfile/environments/default/theme.yaml.gotmpl

@@ -39,48 +39,64 @@ theme:
   ## Define imagery
   #
   imagery:
-    # Xwiki
-    faviconSvgB64: {{ readFile "./../../files/theme/favicon.svg" | b64enc | quote }}
-    faviconIcoB64: {{ readFile "./../../files/theme/favicon.ico" | b64enc | quote }}
-    favicon16PngB64: {{ readFile "./../../files/theme/favicon16.png" | b64enc | quote }}
-    favicon144PngB64: {{ readFile "./../../files/theme/favicon144.png" | b64enc | quote }}
     logoHeaderSvgB64: {{ readFile "./../../files/theme/logoHeader.svg" | b64enc | quote }}
-
-    # Jitsi
     logoHeaderInvertedSvgB64: {{ readFile "./../../files/theme/logoHeaderInverted.svg" | b64enc | quote }}
 
-    # Portal
-    portalLogoBackgroundSvgB64: {{ readFile "./../../files/theme/empty.svg" | b64enc | quote }}
-    portalWaitingSpinnerSvgB64: {{ readFile "./../../files/theme/portalWaitingSpinner.svg" | b64enc | quote }}
+    chat:
+      faviconIco: {{ readFile "./../../files/theme/chat/favicon.ico" | b64enc | quote }}
+
+    files:
+      faviconIco: {{ readFile "./../../files/theme/files/favicon.ico" | b64enc | quote }}
+      faviconPng: {{ readFile "./../../files/theme/files/favicon.png" | b64enc | quote }}
+
+    groupware:
+      faviconIco: {{ readFile "./../../files/theme/groupware/favicon.ico" | b64enc | quote }}
+      faviconSvg: {{ readFile "./../../files/theme/groupware/favicon.svg" | b64enc | quote }}
+
+    knowledge:
+      faviconSvg: {{ readFile "./../../files/theme/knowledge/favicon.svg" | b64enc | quote }}
+      faviconPng: {{ readFile "./../../files/theme/knowledge/favicon.png" | b64enc | quote }}
+
+    portal:
+      faviconIco: {{ readFile "./../../files/theme/portal/favicon.ico" | b64enc | quote }}
+      waitingSpinnerSvg: {{ readFile "./../../files/theme/portal/waitingSpinner.svg" | b64enc  }}
+      logoBackgroundSvg: {{ readFile "./../../files/theme/empty.svg" | b64enc | quote }}
     portalTiles:
-      adminAnnouncement: {{ readFile "./../../files/portal-tiles/admin_announcement.svg" | b64enc | quote }}
-      adminContext: {{ readFile "./../../files/portal-tiles/admin_context.svg" | b64enc | quote }}
-      adminFunctionalmailbox: {{ readFile "./../../files/portal-tiles/admin_functionalmailbox.svg" | b64enc | quote }}
-      adminGroup: {{ readFile "./../../files/portal-tiles/admin_group.svg" | b64enc | quote }}
-      adminResource: {{ readFile "./../../files/portal-tiles/admin_resource.svg" | b64enc | quote }}
-      adminUser: {{ readFile "./../../files/portal-tiles/admin_user.svg" | b64enc | quote }}
-      anonymousLogin: {{ readFile "./../../files/portal-tiles/anonymous_login.svg" | b64enc | quote }}
-      dummyCircle: {{ readFile "./../../files/portal-tiles/dummy_circle.svg" | b64enc | quote }}
-      fileshareActivity: {{ readFile "./../../files/portal-tiles/fileshare_activity.svg" | b64enc | quote }}
-      fileshareDirectdocOdp: {{ readFile "./../../files/portal-tiles/fileshare_directdoc_odp.svg" | b64enc | quote }}
-      fileshareDirectdocOds: {{ readFile "./../../files/portal-tiles/fileshare_directdoc_ods.svg" | b64enc | quote }}
-      fileshareDirectdocOdt: {{ readFile "./../../files/portal-tiles/fileshare_directdoc_odt.svg" | b64enc | quote }}
-      fileshareFiles: {{ readFile "./../../files/portal-tiles/fileshare_files.svg" | b64enc | quote }}
-      groupwareCalendar: {{ readFile "./../../files/portal-tiles/groupware_calendar.svg" | b64enc | quote }}
-      groupwareContacts: {{ readFile "./../../files/portal-tiles/groupware_contacts.svg" | b64enc | quote }}
-      groupwareMail: {{ readFile "./../../files/portal-tiles/groupware_mail.svg" | b64enc | quote }}
-      groupwareTasks: {{ readFile "./../../files/portal-tiles/groupware_tasks.svg" | b64enc | quote }}
-      managementKnowledge: {{ readFile "./../../files/portal-tiles/management_knowledge.svg" | b64enc | quote }}
-      managementProject: {{ readFile "./../../files/portal-tiles/management_project.svg" | b64enc | quote }}
-      notes: {{ readFile "./../../files/portal-tiles/misc_notes.svg" | b64enc | quote }}
-      realtimeCollaboration: {{ readFile "./../../files/portal-tiles/realtime_collaboration.svg" | b64enc | quote }}
-      realtimeVideoconference: {{ readFile "./../../files/portal-tiles/realtime_videoconference.svg" | b64enc | quote }}
-      selfserviceChangepassword: {{ readFile "./../../files/portal-tiles/selfservice_changepassword.svg" | b64enc | quote }}
-      selfserviceEditprofile: {{ readFile "./../../files/portal-tiles/selfservice_editprofile.svg" | b64enc | quote }}
-      selfserviceProtectaccount: {{ readFile "./../../files/portal-tiles/selfservice_protectaccount.svg" | b64enc | quote }}
+      adminAnnouncement: {{ readFile "./../../files/theme/portal-tiles/admin_announcement.svg" | b64enc | quote }}
+      adminContext: {{ readFile "./../../files/theme/portal-tiles/admin_context.svg" | b64enc | quote }}
+      adminFunctionalmailbox: {{ readFile "./../../files/theme/portal-tiles/admin_functionalmailbox.svg" | b64enc | quote }}
+      adminGroup: {{ readFile "./../../files/theme/portal-tiles/admin_group.svg" | b64enc | quote }}
+      adminResource: {{ readFile "./../../files/theme/portal-tiles/admin_resource.svg" | b64enc | quote }}
+      adminUser: {{ readFile "./../../files/theme/portal-tiles/admin_user.svg" | b64enc | quote }}
+      anonymousLogin: {{ readFile "./../../files/theme/portal-tiles/anonymous_login.svg" | b64enc | quote }}
+      dummyCircle: {{ readFile "./../../files/theme/portal-tiles/dummy_circle.svg" | b64enc | quote }}
+      fileshareActivity: {{ readFile "./../../files/theme/portal-tiles/fileshare_activity.svg" | b64enc | quote }}
+      fileshareDirectdocOdp: {{ readFile "./../../files/theme/portal-tiles/fileshare_directdoc_odp.svg" | b64enc | quote }}
+      fileshareDirectdocOds: {{ readFile "./../../files/theme/portal-tiles/fileshare_directdoc_ods.svg" | b64enc | quote }}
+      fileshareDirectdocOdt: {{ readFile "./../../files/theme/portal-tiles/fileshare_directdoc_odt.svg" | b64enc | quote }}
+      fileshareFiles: {{ readFile "./../../files/theme/portal-tiles/fileshare_files.svg" | b64enc | quote }}
+      groupwareCalendar: {{ readFile "./../../files/theme/portal-tiles/groupware_calendar.svg" | b64enc | quote }}
+      groupwareContacts: {{ readFile "./../../files/theme/portal-tiles/groupware_contacts.svg" | b64enc | quote }}
+      groupwareMail: {{ readFile "./../../files/theme/portal-tiles/groupware_mail.svg" | b64enc | quote }}
+      groupwareTasks: {{ readFile "./../../files/theme/portal-tiles/groupware_tasks.svg" | b64enc | quote }}
+      managementKnowledge: {{ readFile "./../../files/theme/portal-tiles/management_knowledge.svg" | b64enc | quote }}
+      managementProject: {{ readFile "./../../files/theme/portal-tiles/management_project.svg" | b64enc | quote }}
+      notes: {{ readFile "./../../files/theme/portal-tiles/misc_notes.svg" | b64enc | quote }}
+      realtimeCollaboration: {{ readFile "./../../files/theme/portal-tiles/realtime_collaboration.svg" | b64enc | quote }}
+      realtimeVideoconference: {{ readFile "./../../files/theme/portal-tiles/realtime_videoconference.svg" | b64enc | quote }}
+      selfserviceChangepassword: {{ readFile "./../../files/theme/portal-tiles/selfservice_changepassword.svg" | b64enc | quote }}
+      selfserviceEditprofile: {{ readFile "./../../files/theme/portal-tiles/selfservice_editprofile.svg" | b64enc | quote }}
+      selfserviceProtectaccount: {{ readFile "./../../files/theme/portal-tiles/selfservice_protectaccount.svg" | b64enc | quote }}
+
+    projects:
+      faviconSvg: {{ readFile "./../../files/theme/projects/favicon.svg" | b64enc | quote }}
+
+    videoconference:
+      faviconSvg: {{ readFile "./../../files/theme/videoconference/favicon.svg" | b64enc | quote }}
 
   ## Where required define complete Stylesheets
   #
   styles:
-    portalCss: {{ readFile "./../../files/theme/portalStylesheet.css" | b64enc }}
+    portal:
+      main: {{ readFile "./../../files/theme/portal/stylesheet.css" | b64enc }}
 ...

helmfile/files/theme/_dev/red.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="1" height="1"><rect width="100%" height="100%" fill="red"/></svg>

helmfile/files/theme/groupware/favicon.svg

@@ -0,0 +1,5 @@
+<svg width="110" height="110" viewBox="0 0 110 110" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="110" height="110" rx="20" fill="white"/>
+<path d="M83.0501 33.75H26.8501L54.9501 54.75L83.0501 33.75Z" fill="#571EFA"/>
+<path d="M54.95 63.65L26.65 42.35V69.15C26.65 73.05 29.85 76.25 33.75 76.25H76.25C80.15 76.25 83.35 73.05 83.35 69.15V42.35C83.35 42.35 55.05 63.65 54.95 63.65Z" fill="#571EFA" fill-opacity="0.7"/>
+</svg>

helmfile/files/theme/knowledge/favicon.svg

@@ -0,0 +1,5 @@
+<svg width="110" height="110" viewBox="0 0 110 110" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="110" height="110" rx="20" fill="white"/>
+<path d="M65.65 72.7C65.65 78.6 60.85 83.3 55.05 83.3C49.25 83.3 44.45 78.5 44.45 72.7V69.2H65.75V72.7H65.65Z" fill="#571EFA" fill-opacity="0.7"/>
+<path d="M55.05 26.7C43.35 26.7 33.75 36.2 33.75 48C33.75 53.5 35.85 58.4 39.25 62.2H70.85C74.25 58.4 76.25 53.5 76.25 48C76.25 36.3 66.75 26.7 54.95 26.7H55.05Z" fill="#571EFA"/>
+</svg>

helmfile/files/theme/portalWaitingSpinner.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Ebene_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: #571efa;
-      }
-
-      .cls-2 {
-        fill: #927afa;
-      }
-    </style>
-  </defs>
-  <path class="cls-2" d="M83.1,97.26v2.12c0,8.97-7.3,16.27-16.27,16.27H28.62c-8.97,0-16.27-7.3-16.27-16.27v-38.2c0-8.97,7.3-16.27,16.27-16.27h2.12v52.35h52.35Z"/>
-  <path class="cls-1" d="M83.81,84.52h-40.33v-44.57c0-15.22,12.38-27.59,27.59-27.59h12.74c17.56,0,31.84,14.28,31.84,31.84v8.49c0,17.56-14.28,31.84-31.84,31.84ZM61.88,66.12h21.93c7.41,0,13.44-6.03,13.44-13.44v-8.49c0-7.41-6.03-13.44-13.44-13.44h-12.74c-5.07,0-9.2,4.13-9.2,9.2v26.18Z"/>
-</svg>

helmfile/files/theme/projects/favicon.svg

@@ -0,0 +1,6 @@
+<svg width="110" height="110" viewBox="0 0 110 110" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="110" height="110" rx="20" fill="white"/>
+<path d="M30.2 30.15H16V79.75H30.2V30.15Z" fill="#571EFA"/>
+<path d="M86.9 58.55H58.6C54.6788 58.55 51.5 61.7288 51.5 65.65V72.75C51.5 76.6712 54.6788 79.85 58.6 79.85H86.9C90.8212 79.85 94 76.6712 94 72.75V65.65C94 61.7288 90.8212 58.55 86.9 58.55Z" fill="#571EFA"/>
+<path d="M65.6 30.15H44.2C40.2788 30.15 37.1 33.3288 37.1 37.25V44.35C37.1 48.2712 40.2788 51.45 44.2 51.45H65.6C69.5212 51.45 72.7 48.2712 72.7 44.35V37.25C72.7 33.3288 69.5212 30.15 65.6 30.15Z" fill="#571EFA" fill-opacity="0.7"/>
+</svg>

helmfile/files/theme/videoconference/favicon.svg

@@ -0,0 +1,5 @@
+<svg width="110" height="110" viewBox="0 0 110 110" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="110" height="110" rx="20" fill="white"/>
+<path d="M57.1 33.75H28.8C24.8788 33.75 21.7 36.9288 21.7 40.85V69.15C21.7 73.0712 24.8788 76.25 28.8 76.25H57.1C61.0212 76.25 64.2 73.0712 64.2 69.15V40.85C64.2 36.9288 61.0212 33.75 57.1 33.75Z" fill="#571EFA"/>
+<path d="M88.3 71.95C78.9 71.95 71.3 64.35 71.3 54.95C71.3 45.55 78.9 37.95 88.3 37.95V71.95Z" fill="#571EFA" fill-opacity="0.7"/>
+</svg>