fix(gotmpl): Sort values for existing secrets

Signed-off-by: Axel Lender <lender@b1-systems.de>
feat(helmfile): Template SMTP credentials as external secrets for Postfix
2025-12-06 07:21:36 +01:00 · 2025-08-12 14:27:31 +02:00 · 2025-08-12 08:22:31 +02:00 · 2025-08-11 20:46:22 +02:00 · 2025-08-11 20:46:22 +02:00
36 changed files with 234 additions and 244 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,25 +1,3 @@
-## [1.7.1](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/compare/v1.7.0...v1.7.1) (2025-08-26)
-
-
-### Bug Fixes
-
-* **collabora:** Update from 25.04.3 to 25.04.4 ([84d6b50](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/84d6b504d21e687de3fb4cdabafc9cff6fe1f1d7))
-* **helmfile:** When optional mail domain is set, use it as sender domain for system generated (noreply) mails ([bd4c997](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/bd4c997950750e36168434e82daf48f20d0a42df))
-* **jitsi:** Increase `patchJVB` job `backoffLimit` to avoid deployment failures on infrastructure where LoadBalancer services take longer to become available ([eb2a181](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/eb2a1811fb1d11b0dd0ea0e9987f96846a855ac7))
-* **nextcloud:** Fetch central navigation from cluster internal service ([dd0e516](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/dd0e516778104c47ef990d95d01bdec6b33d9bab))
-* **nextcloud:** Stop browser from caching server-generated files ([410a1ad](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/410a1ade6907f676d3c4cbc68b33754e0e41e9fb))
-* **nextcloud:** Work around a bug that breaks the `nextcloud-management` job in case the theming `primary_color` was set in Nextcloud's web UI ([4aebe22](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/4aebe22f22dc9e679563a46687ebdc8793c281e8))
-* **notes:** Explicitly template security contexts; add missing ingress classes and pull secrets ([834c847](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/834c84768a3a6537990e27377acb170b6269dfb0))
-* **nubus:** Remove temporary `nubusUdmListener` `livenessProbe` as recommended by supplier ([688a505](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/688a505ef780e7c81006a73db6465ef75dea1404))
-* **open-xchange:** Click on top bar logo to point to portal instead of mail inbox ([9f762a7](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/9f762a7c2ea3f8e4d3207d8d2aae44597a366ee0))
-* **open-xchange:** Configure correct autoreply addresses and enable FTS in Dovecot EE ([997c083](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/997c083335b79aa7446894b6ebbb6ed1d5950a3d))
-* **open-xchange:** Explicitly deactivate DAV support if not enabled in `functional.yaml.gotmpl` ([62ba5ab](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/62ba5aba496af40208a13abeb6c8f1de62e98e35))
-* **open-xchange:** Fix FTS bulk delete in Dovecot EE ([cd2a356](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/cd2a356b89249b8a163f2becc57832164bc6c8e5))
-* **open-xchange:** Set mail quota using `functional.groupware.quota.default` ([67fe50e](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/67fe50e53c7477016efe3b3d90c63214928f165c))
-* **opendesk-static-files:** Serve missing `.png` favicons for Notes and the Nextcloud topbar logo ([42b1105](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/42b11059d29d6445e1e4e3309ad7a9a026b56c92))
-* **ox-connector:** Update OX Connector and OX Extension to v0.27.7 ([57c96af](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/57c96af5a545a6a6851926b85bca0dc24263b55e))
-* **xwiki:** Templating of `imagePullSecrets` ([bbbcd68](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/bbbcd6807e972c6120d90df52b8ffe9da03ebce3))
-
 # [1.7.0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/compare/v1.6.0...v1.7.0) (2025-08-11)


--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ openDesk currently features the following functional main components:
 | Portal & IAM         | Nubus                       | AGPL-3.0-or-later                                                                      | [1.12.0](https://docs.software-univention.de/nubus-kubernetes-release-notes/1.x/en/1.12.html#version-1-12-0-2025-07-31)      | [Univention's documentation website](https://docs.software-univention.de/n/en/nubus.html)                                             |
 | Project management   | OpenProject                 | GPL-3.0-only                                                                           | [16.2.1](https://www.openproject.org/docs/release-notes/16-2-1/)                                                             | [For the most recent release](https://www.openproject.org/docs/user-guide/)                                                           |
 | Videoconferencing    | Jitsi                       | Apache-2.0                                                                             | [2.0.9955](https://github.com/jitsi/jitsi-meet/releases/tag/stable%2Fjitsi-meet_9955)                                        | [For the most recent  release](https://jitsi.github.io/handbook/docs/category/user-guide/)                                            |
-| Weboffice            | Collabora                   | MPL-2.0                                                                                | [25.04.4](https://www.collaboraoffice.com/code-25-04-release-notes/)                                                         | Online documentation available from within the installed application; [Additional resources](https://sdk.collaboraonline.com/)        |
+| Weboffice            | Collabora                   | MPL-2.0                                                                                | [25.04.3](https://www.collaboraoffice.com/code-25-04-release-notes/)                                                         | Online documentation available from within the installed application; [Additional resources](https://sdk.collaboraonline.com/)        |

 While not all components are perfectly designed for the execution inside containers, one of the project's objectives is to
 align the applications with best practices regarding container design and operations.
--- a/dev/charts-local.py
+++ b/dev/charts-local.py
@@ -129,7 +129,7 @@ def grep_yaml(file):
    with open(file, 'r') as file:
        content = ''
        for line in file.readlines():
-            if not '{{' in line:
+            if not ': {{' in line and not '- {{' in line:
                content += line
    return yaml.safe_load(content)

--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -15,27 +15,27 @@ SPDX-License-Identifier: Apache-2.0
  * [Keycloak Extensions](#keycloak-extensions)
  * [OpenLDAP](#openldap)
 * [Authorization](#authorization)
-  * [LDAP group synchronization](#ldap-group-synchronization)
+  * [LDAP Group Synchronization](#ldap-group-synchronization)
 * [Provisioning](#provisioning)
  * [OX Connector](#ox-connector)
  * [SCIM](#scim)
 * [Component integration](#component-integration)
-  * [Intercom Service / Silent login](#intercom-service--silent-login)
-  * [Central contacts](#central-contacts)
-  * [Central navigation](#central-navigation)
+  * [Intercom Service / Silent Login](#intercom-service--silent-login)
+  * [Central Contacts](#central-contacts)
+  * [Central Navigation](#central-navigation)
  * [Filepicker](#filepicker)
  * [Newsfeed](#newsfeed)
-  * [(OpenProject) File store](#openproject-file-store)
-* [Applications vs. services](#applications-vs-services)
-  * [Collabora (weboffice)](#collabora-weboffice)
-  * [CryptPad Online (diagrams)](#cryptpad-online-diagrams)
-  * [Element/Synapse (chat \& call)](#elementsynapse-chat--call)
-  * [Jitsi (video conferencing)](#jitsi-video-conferencing)
-  * [Nextcloud (files)](#nextcloud-files)
-  * [Nubus (identity and access management / portal)](#nubus-identity-and-access-management--portal)
-  * [OpenProject (project management)](#openproject-project-management)
-  * [OX App Suite (groupware) with OX Dovecot (mail backend)](#ox-app-suite-groupware-with-ox-dovecot-mail-backend)
-  * [XWiki (knowledge management)](#xwiki-knowledge-management)
+  * [(OpenProject) File Store](#openproject-file-store)
+* [Applications vs. Services](#applications-vs-services)
+  * [Collabora (Office)](#collabora-office)
+  * [CryptPad Online (Diagrams)](#cryptpad-online-diagrams)
+  * [Element/Synapse (Chat \& Call)](#elementsynapse-chat--call)
+  * [Jitsi (Video Conferencing)](#jitsi-video-conferencing)
+  * [Nextcloud (Files)](#nextcloud-files)
+  * [Nubus (Identity and Access Management / Portal)](#nubus-identity-and-access-management--portal)
+  * [OpenProject (Project management)](#openproject-project-management)
+  * [OX App Suite (Groupware) with OX Dovecot (Mail backend)](#ox-app-suite-groupware-with-ox-dovecot-mail-backend)
+  * [XWiki (Knowledge management)](#xwiki-knowledge-management)
 * [Application specific user accounts](#application-specific-user-accounts)
 * [Footnotes](#footnotes)
 <!-- TOC -->
@@ -210,7 +210,7 @@ To address these use cases, the Keycloak Extensions act as a proxy to Keycloak.

 # Authorization

-## LDAP group synchronization
+## LDAP Group Synchronization

 LDAP group synchronization ensures that user group memberships are consistent across the applications in openDesk that make use of the IAM group information. Nubus uses OpenLDAP to store and manage user groups, which are synchronized with integrated applications to enforce access control policies.

@@ -273,7 +273,7 @@ flowchart TD

 Details can be found in the upstream documentation that is linked in the respective sections.

-## Intercom Service / Silent login
+## Intercom Service / Silent Login

 The Intercom Service is deployed in the context of Nubus. Its role is to enable cross-application integration
 based on the user's browser interaction, as handling authentication when the frontend of an application has to call
@@ -286,7 +286,7 @@ Currently, only OX AppSuite and Element are using the frontend-based integration
 **Links:**
 - [Intercom Service upstream documentation](https://docs.software-univention.de/intercom-service/latest/index.html).

-## Central contacts
+## Central Contacts

 OX App Suite is responsible for managing contacts in openDesk. Therefore, Nextcloud's PHP backend is using the OX AppSuite's middleware Contacts API to
 - create a new contact in the user's contacts folder when a file is shared with an unknown email address.
@@ -296,7 +296,7 @@ OX App Suite is responsible for managing contacts in openDesk. Therefore, Nextcl
 - Currently used [OX Contacts API (deprecated)](https://documentation.open-xchange.com/components/middleware/http/8/index.html#!Contacts).
 - New [OX Addressbooks API](https://documentation.open-xchange.com/components/middleware/http/8/index.html#!Addressbooks) the Central Contacts integration will switch to.

-## Central navigation
+## Central Navigation

 Central navigation is based on an API endpoint in the Nubus portal that returns a JSON containing the portal's contents for
 a given user. The response from the API endpoint is used in the openDesk applications to render the central navigation.
@@ -338,7 +338,7 @@ service through the Intercom Service's `/wiki` endpoint, in combination with the
 **Links:**
 - [XWiki Blog feature](https://extensions.xwiki.org/xwiki/bin/view/Extension/Blog%20Application)

-## (OpenProject) File store
+## (OpenProject) File Store

 While OpenProject allows you to attach files to work packages directly, it is often preferred that the files are
 stored within Nextcloud or to link an existing file from your openDesk Nextcloud to a work package.
@@ -351,7 +351,7 @@ The file store must still be enabled per project in OpenProject's project admin
 - [OpenProject's documentation on Nextcloud integration](https://www.openproject.org/docs/system-admin-guide/integrations/nextcloud/)
 - [OpenProject Integration Nextcloud app](https://apps.nextcloud.com/apps/integration_openproject)

-# Applications vs. services
+# Applications vs. Services

 openDesk consists of a variety of open-source projects, please find an overview below:

@@ -366,16 +366,16 @@ openDesk consists of a variety of open-source projects, please find an overview
 | Element               | Secure communications platform   | Application |
 | Jitsi                 | Videoconferencing                | Application |
 | MariaDB               | Database                         | Service     |
-| Memcached             | Cache database                   | Service     |
-| MinIO                 | Object storage                   | Service     |
+| Memcached             | Cache Database                   | Service     |
+| MinIO                 | Object Storage                   | Service     |
 | Nextcloud             | File share                       | Application |
-| Nubus (UMS)           | Identity management & portal     | Application |
+| Nubus (UMS)           | Identity Management & Portal     | Application |
 | OpenProject           | Project management               | Application |
 | OX Appsuite & Dovecot | Groupware with IMAP mail backend | Application |
 | Postfix               | MTA                              | Service     |
 | PostgreSQL            | Database                         | Service     |
-| Redis                 | Cache database                   | Service     |
-| XWiki                 | Knowledge management             | Application |
+| Redis                 | Cache Database                   | Service     |
+| XWiki                 | Knowledge Management             | Application |

 The end user focussed components are called applications and provide the functional scope of openDesk, please find separate paragraphs on each of the applications below.

@@ -383,25 +383,25 @@ Other components are of type "Service", these are used for development and evalu

 For the APIs / Protocols supported by the applications, please read the [apis.md](./docs/architecture/apis.md).

-## Collabora (weboffice)
+## Collabora (Office)

 [Collabora](https://www.collaboraonline.com) is a powerful online document editing suite.

 In openDesk, Collabora is used for editing Office documents such as rich texts, spreadsheets and presentations.

-## CryptPad Online (diagrams)
+## CryptPad Online (Diagrams)

 [CryptPad](https://cryptpad.org/) is a collaborative editor framework supporting end-to-end encryption.

 In openDesk, CryptPad is for editing diagrams.net documents.

-## Element/Synapse (chat & call)
+## Element/Synapse (Chat & Call)

 [Element Web](https://github.com/element-hq/element-web) is the web frontend for [Synapse](https://github.com/element-hq/synapse), the reference implementation of the sovereign and secure [Matrix protocol](https://matrix.org).

 In openDesk, Element is used for chat and direct audio & video calling.

-## Jitsi (video conferencing)
+## Jitsi (Video Conferencing)

 [Jitsi](https://jitsi.org) is an open-source video conferencing solution that allows users to hold secure video meetings.

@@ -409,27 +409,27 @@ In openDesk, Jitsi is used for video conferencing and online meetings. It integr

 [Jigasi](https://github.com/jitsi/jigasi) (Jitsi's SIP component) also allows joining the meeting via phone call if an external SIP server and SIP trunk are provided.

-## Nextcloud (files)
+## Nextcloud (Files)

 [Nextcloud](https://nextcloud.com) is a file storage and sync platform with powerful collaboration capabilities with desktop, mobile and web interfaces.

-## Nubus (identity and access management / portal)
+## Nubus (Identity and Access Management / Portal)

 [Nubus](https://www.univention.com/products/nubus/) is a unified Identity & Access Management, providing you with full control and digital sovereignty over your IAM processes and data.

 In openDesk, Nubus provides the management required for users, groups and other IAM objects, as well as the portal, the Identity provider for Single Sign-On and federation scenarios.

-## OpenProject (project management)
+## OpenProject (Project management)

 [OpenProject](https://www.openproject.org) is a project management tool that supports agile project management, team collaboration, issue tracking, and more.

-## OX App Suite (groupware) with OX Dovecot (mail backend)
+## OX App Suite (Groupware) with OX Dovecot (Mail backend)

 [OX App Suite](https://www.open-xchange.com/products/ox-app-suite) is a groupware application using [OX Dovecot](https://www.dovecot.org/) as its backend mail store.

 In openDesk, OX App Suite is used for email, calendar, address book and personal task management.

-## XWiki (knowledge management)
+## XWiki (Knowledge management)

 [XWiki](https://www.xwiki.org) is an open-source wiki platform for knowledge management and collaboration.

--- a/docs/baseline-requirements.md
+++ b/docs/baseline-requirements.md
@@ -9,7 +9,7 @@ SPDX-License-Identifier: Apache-2.0
 * [Software bill of materials (SBOMs)](#software-bill-of-materials-sboms)
  * [Artifact SBOMs](#artifact-sboms)
  * [Source code SBOMs](#source-code-sboms)
-* [License compliance](#license-compliance)
+* [License Compliance](#license-compliance)
 * [Software supply chain security](#software-supply-chain-security)
 * [Container architectural basics](#container-architectural-basics)
 * [Security](#security)
@@ -25,7 +25,7 @@ SPDX-License-Identifier: Apache-2.0
  * [Top bar](#top-bar)
    * [Look and feel](#look-and-feel)
    * [Central navigation](#central-navigation)
-  * [Functional administration](#functional-administration)
+  * [Functional Administration](#functional-administration)
  * [Theming](#theming)
  * [Central user profile](#central-user-profile)
 * [Footnotes](#footnotes)
@@ -60,7 +60,7 @@ Today's software development platforms like GitLab or GitHub provide dependency

 **Reference:** Currently we do not have source code SBOMs in place.

-# License compliance
+# License Compliance

 All parts of openDesk Community Edition must be open source with source code (also) published or at least publishable on openCode.

@@ -243,7 +243,7 @@ When implementing the central navigation into an application there are two optio

 **Reference:** This is available in current deployments in all applications except for Jitsi, Collabora, and CryptPad.

-## Functional administration
+## Functional Administration

 While applications usually support technical and functional administration the technical part should be in the responsibility of the operator and is usually done at (re)deployment time. Therefore the administrative tasks within an application should be limited to functional administration.

--- a/docs/functional.md
+++ b/docs/functional.md
@@ -26,7 +26,6 @@ The following categories are available. Each category contains a set of options
 * Portal options (`functional.portal.*`): Options to customize the openDesk portal, e.g. if the login dialog should be enforced.
 * Chat options (`functional.chat.*`): Configuration options for the chat component of openDesk.
 * Migration options (`functional.migration.*`): Helpful setting(s) for migration scenarios.
-* Groupware options (`functional.groupware.*`): Options to customize Open-Xchange and mail settings, e.g. mail quota.

 ## Customization of functional options

--- a/docs/migrations.md
+++ b/docs/migrations.md
@@ -96,7 +96,7 @@ Manual checks and possible activities are also required by openDesk updates, the

 We cannot hold back all migrations as some are required e.g. due to a change in a specific component that we want/need to update, we try to bundle others only with major releases.

-This section provides an overview of potential changes to be part of the next major release (openDesk 2.0).
+This section should provide you with an overview of what changes to expect in the next major release (openDesk 2.0) expected in September 2025.

 - `functional.portal.link*` (see `functional.yaml.gotmpl` for details) are going to be moved into the `theme.*` tree, we are also going to move the icons used for the links currently found under `theme.imagery.portalEntries` in this step.
 - We will explicitly set the [database schema configuration](https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/Configuration/#HConfigurethenamesofdatabaseschemas) for XWiki to avoid the use of the `public` schema.
--- a/docs/permissions.md
+++ b/docs/permissions.md
@@ -20,7 +20,7 @@ openDesk uses role-based access control (RBAC) to manage permissions. This syste
      * [Administrative access to applications](#administrative-access-to-applications)
    * [Custom groups](#custom-groups)
  * [Assigning roles/groups and permissions](#assigning-rolesgroups-and-permissions)
-  * [Predefined roles/user templates](#predefined-rolesuser-templates)
+  * [Predefined roles / user templates](#predefined-roles--user-templates)
    * [*openDesk User*](#opendesk-user)
    * [*openDesk Administrator*](#opendesk-administrator)
  * [Managing permissions](#managing-permissions)
@@ -30,7 +30,7 @@ openDesk uses role-based access control (RBAC) to manage permissions. This syste
  * [Delegation](#delegation)
  * [Regular review](#regular-review)
 * [Applications](#applications)
-  * [Roles/Groups](#rolesgroups)
+  * [Roles/groups](#rolesgroups)
 <!-- TOC -->

 # Identity and Access Management (IAM)
@@ -126,7 +126,7 @@ While openDesk ships with predefined groups, additional groups can be [created](

 Users get roles assigned based on their responsibilities and the tasks they need to perform. This assignment can be done by an admin through the [administration portal](https://docs.opendesk.eu/administration/).

-## Predefined roles/user templates
+## Predefined roles / user templates

 openDesk defines [templates](https://gitlab.opencode.de/bmi/opendesk/components/platform-development/images/opendesk-nubus/-/blob/main/udm/udm-data-loader/65-usertemplate.yaml) for the *User* and *Administrator* roles. The templates can be used by an *openDesk Administrator* to create users with these roles using the [administration portal](https://docs.opendesk.eu/administration/).

@@ -191,7 +191,7 @@ While the overall role and permission setup must be checked by the customer, inc

 Managing all application permissions within the IAM would require a superset of permissions to be available in the IAM. This would lead to a high level of administrative complexity. Instead, the application specific permissions are usually managed within an application itself and mapped to roles/groups that are managed in the IAM.

-## Roles/Groups
+## Roles/groups

 Within IAM groups, the visibility of openDesk applications can be configured. Like with users, this is done in the "openDesk" tab of the [group administration](https://docs.opendesk.eu/administration/gruppen/).

--- a/docs/releases.md
+++ b/docs/releases.md
@@ -3,30 +3,30 @@ SPDX-FileCopyrightText: 2025 Zentrum für Digitale Souveränität der Öffentlic
 SPDX-License-Identifier: Apache-2.0
 -->

-<h1>Release management</h1>
+<h1>Release Management</h1>

 This document outlines the release and patch management strategy for **openDesk**, ensuring that all updates, patches, and new releases are systematically **planned, tested, documented**, and **reliably deployed** into production. The process is designed to align with operational planning requirements and maintain system stability and security.

 <!-- TOC -->
-* [Release cycle](#release-cycle)
-  * [Release types](#release-types)
-  * [Release schedule](#release-schedule)
+* [Release Cycle](#release-cycle)
+  * [Release Types](#release-types)
+  * [Release Schedule](#release-schedule)
  * [Upgrades](#upgrades)
-* [Patch management process](#patch-management-process)
-  * [Patch identification \& prioritization](#patch-identification--prioritization)
-  * [Patch workflow](#patch-workflow)
-* [Communication plan](#communication-plan)
-  * [Announcement channels](#announcement-channels)
-  * [Timing of communications](#timing-of-communications)
-* [Documentation requirements](#documentation-requirements)
-* [Compliance \& review](#compliance--review)
+* [Patch Management Process](#application-administration)
+  * [Patch Identification & Prioritization](#patch-identification-prioritization)
+  * [Patch Workflow](#patch-workflow)
+* [Communication Plan](#communication-plan)
+  * [Announcement Channels](#announcement-channels)
+  * [Timing of Communications](#timing-of-communications)
+* [Documentation Requirements](#documentation-requirements)
+* [Compliance & Review](#compliance-review)
 <!-- TOC -->

-# Release cycle
+# Release Cycle

 openDesk follows a structured release cycle to ensure predictability and reliability:

-## Release types
+## Release Types

 | Type           | Frequency     | Content                                                       |
 |----------------|---------------|---------------------------------------------------------------|
@@ -36,7 +36,7 @@ openDesk follows a structured release cycle to ensure predictability and reliabi

 > **Note:** openDesk does **not** guarantee that minor releases are 100% backward‑compatible. When a breaking change is unavoidable it is announced in the release notes under a dedicated header **“Breaking Changes”** and a migration guide is provided.

-## Release schedule
+## Release Schedule

 - **Major releases** are scheduled for **Q3 each year**, with planning beginning in Q1.
 - **Minor releases** occur **monthly on Mondays**, typically **around 10:00 AM** local time.
@@ -54,11 +54,11 @@ openDesk follows a structured release cycle to ensure predictability and reliabi
 - All breaking changes, including those in monthly minor releases, are highlighted in the release notes under Breaking Changes.
 - Additional, non‑binding migration hints are collected in `migrations.md`

-# Patch management process
+# Patch Management Process

 A standardized process ensures patches are developed, prioritized, and deployed efficiently.

-## Patch identification & prioritization
+## Patch Identification & Prioritization

 Patches are categorized by severity and urgency:

@@ -69,7 +69,7 @@ Patches are categorized by severity and urgency:
 | **Medium**     | Functional bugs with workarounds, minor usability issues                 |
 | **Low**        | Cosmetic issues, documentation updates                                   |

-## Patch workflow
+## Patch Workflow

 The following steps define the patch workflow from issue identification to post-deployment review. This process ensures consistent quality and minimal disruption to users:

@@ -83,18 +83,18 @@ The following steps define the patch workflow from issue identification to post-

 This workflow ensures that patches are handled with the same level of discipline as planned releases, supporting both reliability and agility.

-# Communication plan
+# Communication Plan

 A lightweight approach reduces manual effort while maintaining transparency.

-## Announcement channels
+## Announcement Channels

 | Channel | Audience | Purpose | Owner |
 |---------|----------|---------|-------|
 | **openCode Changelog** | Community & EE | Primary source of truth for every release | DevOps |
 | **Account‑Manager Mail / Ticket** | Enterprise customers | Targeted information & upgrade advice | Customer Success |

-## Timing of communications
+## Timing of Communications

 | Release Type | What | When |
 |--------------|------|------|
@@ -107,7 +107,7 @@ A lightweight approach reduces manual effort while maintaining transparency.

 Community users consume information via openCode; Enterprise customers get an additional nudge via their account manager – **no mass mailings are sent manually**.

-# Documentation requirements
+# Documentation Requirements

 Each release (major, minor, or patch) must include:

@@ -116,7 +116,7 @@ Each release (major, minor, or patch) must include:
 - **Test reports** confirming QA coverage and results
 - **Deployment checklist** reviewed and approved by the product owner

-# Compliance & review
+# Compliance & Review

 - The release process is reviewed **bi-annually** to incorporate feedback and evolving requirements
 - Emergency patches (e.g., zero-day security issues) may bypass the standard schedule but must be documented post-deployment
--- a/docs/security-context.md
+++ b/docs/security-context.md
@@ -172,9 +172,9 @@ This list gives you an overview of templated security settings and if they compl
 | **nextcloud**/opendesk-nextcloud-notifypush | :white_check_mark: | no | no | yes | yes | 101 | 101 | yes | yes |
 | **nextcloud**/opendesk-nextcloud/aio | :white_check_mark: | no | no | yes | yes | 101 | 101 | yes | yes |
 | **nextcloud**/opendesk-nextcloud/exporter | :white_check_mark: | no | no | yes | yes | 65532 | 65532 | yes | yes |
-| **notes**/impress/backend | :white_check_mark: | no | no | yes | yes | 1001 | 1001 | yes | yes |
-| **notes**/impress/frontend | :white_check_mark: | no | no | yes | yes | 1000 | 1000 | yes | yes |
-| **notes**/impress/y-provider | :white_check_mark: | no | no | yes | yes | 1001 | 1001 | yes | yes |
+| **notes**/impress/backend | :x: | n/a | n/a | n/a | n/a | n/a | n/a | n/a | no |
+| **notes**/impress/frontend | :x: | n/a | n/a | n/a | n/a | n/a | n/a | n/a | no |
+| **notes**/impress/y-provider | :x: | n/a | n/a | n/a | n/a | n/a | n/a | n/a | no |
 | **nubus**/intercom-service | :white_check_mark: | no | no | yes | yes | 1000 | 1000 | yes | yes |
 | **nubus**/intercom-service/provisioning | :x: | n/a | n/a | n/a | n/a | n/a | n/a | yes | no |
 | **nubus**/opendesk-keycloak-bootstrap | :white_check_mark: | no | no | yes | yes | 1000 | 1000 | yes | yes |
--- a/docs/security.md
+++ b/docs/security.md
@@ -8,12 +8,12 @@ SPDX-License-Identifier: Apache-2.0
 This document covers the current status of security measures.

 <!-- TOC -->
-* [Helm chart trust chain](#helm-chart-trust-chain)
-* [Kubernetes security enforcements](#kubernetes-security-enforcements)
-* [Network policies](#network-policies)
+* [Helm Chart Trust Chain](#helm-chart-trust-chain)
+* [Kubernetes Security Enforcements](#kubernetes-security-enforcements)
+* [NetworkPolicies](#networkpolicies)
 <!-- TOC -->

-# Helm chart trust chain
+# Helm Chart Trust Chain

 Helm charts are signed and validated against GPG keys in `helmfile/files/gpg-pubkeys`.

@@ -25,22 +25,22 @@ All charts except the ones mentioned below are verifiable:
 |-------------------|:----------:|
 | open-xchange-repo |     no     |

-# Kubernetes security enforcements
+# Kubernetes Security Enforcements

 This list gives you an overview of default security settings and whether they comply with security standards:

 ⟶ Visit our generated detailed [Security Context](./docs/security-context.md) overview.

-# Network policies
+# NetworkPolicies

-Kubernetes network policies are an essential measure to secure your Kubernetes apps and clusters.
+Kubernetes NetworkPolicies are an essential measure to secure your Kubernetes apps and clusters.
 When applied, they restrict traffic to your services.
-`NetworkPolicy` resources protect other deployments in your cluster or other services in your deployment from getting compromised when another
+NetworkPolicies protect other deployments in your cluster or other services in your deployment from getting compromised when another
 component is compromised.

-We ship a default set of Otterize `ClientIntents` via
+We ship a default set of Otterize ClientIntents via
 [Otterize intents operator](https://github.com/otterize/intents-operator) which translates intent-based access control
-(IBAC) into Kubernetes native network policies.
+(IBAC) into Kubernetes native NetworkPolicies.

 This requires the Otterize intents operator to be installed.

--- a/helmfile/apps/element/values-synapse.yaml.gotmpl
+++ b/helmfile/apps/element/values-synapse.yaml.gotmpl
@@ -132,7 +132,7 @@ configuration:
      allowUsersToUpdateDisplayname: {{ .Values.functional.chat.matrix.profile.allowUsersToUpdateDisplayname }}

    smtp:
-      senderAddress: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.mailDomain | default .Values.global.domain }}"
+      senderAddress: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}"
      host: {{ printf "%s.%s.svc.%s" "postfix" (.Values.apps.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
      port: 25
      tls: false
--- a/helmfile/apps/jitsi/values-jitsi.yaml.gotmpl
+++ b/helmfile/apps/jitsi/values-jitsi.yaml.gotmpl
@@ -302,7 +302,6 @@ jitsi:
  {{- end }}

 patchJVB:
-  backoffLimit: 12
  configuration:
    staticLoadbalancerIP: {{ .Values.cluster.networking.ingressGatewayIP | quote }}
    loadbalancerStatusField: {{ .Values.cluster.networking.loadBalancerStatusField | quote }}
--- a/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl
+++ b/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl
@@ -130,7 +130,6 @@ configuration:

  opendeskIntegration:
    centralNavigation:
-      jsonUrl: "http://ums-portal-server/portal/navigation.json"
      username:
        value: "opendesk_username"
      password:
@@ -162,7 +161,7 @@ configuration:
    host: {{ printf "%s.%s.svc.%s" "postfix" (.Values.apps.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
    port: 587
    fromAddress: {{ .Values.smtp.localpartNoReply | quote }}
-    mailDomain: "{{ .Values.global.mailDomain | default .Values.global.domain }}"
+    mailDomain: "{{ .Values.global.domain }}"
    security: "tls"
    skipVerifyPeer: true

--- a/helmfile/apps/notes/values.yaml.gotmpl
+++ b/helmfile/apps/notes/values.yaml.gotmpl
@@ -4,12 +4,10 @@
 global:
  collaborationServerSecret:
    value: {{ .Values.secrets.notes.collaborationSecret | quote }}
-  fqdn: "{{ .Values.global.hosts.notes }}.{{ .Values.global.domain }}"
-  imagePullSecrets:
-    {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
-  tlsSecretName: {{ .Values.ingress.tls.secretName | quote }}
  yProviderApiKey:
    value: {{ .Values.secrets.notes.collaborationSecret | quote }}
+  fqdn: "{{ .Values.global.hosts.notes }}.{{ .Values.global.domain }}"
+  tlsSecretName: {{ .Values.ingress.tls.secretName | quote }}

 backend:
  image:
@@ -25,13 +23,14 @@ backend:
      {{- if .Values.annotations.notesBackend.ingress }}
      {{ .Values.annotations.notesBackend.ingress | toYaml | nindent 6 }}
      {{- end }}
-    ingressClassName: {{ .Values.ingress.ingressClassName }}
  ingressAdmin:
    enabled: true
    annotations:
      {{ .Values.annotations.notesBackend.ingressAdmin | toYaml | nindent 6 }}
-    ingressClassName: {{ .Values.ingress.ingressClassName }}
  replicaCount: {{ .Values.replicas.notesBackend }}
+  containerSecurityContext:
+    seLinuxOptions:
+      {{ .Values.seLinuxOptions.notesBackend | toYaml | nindent 6 }}
  configuration:
    ai:
      apiKey:
@@ -58,7 +57,7 @@ backend:
        value: {{ .Values.databases.notes.username | quote }}
    email:
      brandName: "openDesk"
-      from: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.mailDomain | default .Values.global.domain }}"
+      from: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}"
      host: "postfix"
      port: "25"
      logoImage: {{ printf "https://%s.%s/univention/portal/icons/entries/swp.notes.svg" .Values.global.hosts.nubus .Values.global.domain | quote }}
@@ -101,31 +100,12 @@ backend:
      value: "False"
    - name: "FRONTEND_FOOTER_FEATURE_ENABLED"
      value: "False"
-  containerSecurityContext:
-    allowPrivilegeEscalation: false
-    capabilities:
-      drop:
-        - "ALL"
-    enabled: true
-    privileged: false
-    runAsUser: 1001
-    runAsGroup: 1001
-    seccompProfile:
-      type: "RuntimeDefault"
-    readOnlyRootFilesystem: true
-    runAsNonRoot: true
-    seLinuxOptions:
-      {{ .Values.seLinuxOptions.notesBackend | toYaml | nindent 6 }}
  podAnnotations:
    {{ .Values.annotations.notesBackend.pod | toYaml | nindent 4 }}
  podAnnotationsCreateUser:
    {{ .Values.annotations.notesBackend.createUserJob | toYaml | nindent 4 }}
  podAnnotationsMigrate:
    {{ .Values.annotations.notesBackend.migrateJob | toYaml | nindent 4 }}
-  podSecurityContext:
-    enabled: true
-    fsGroup: 1000
-    fsGroupChangePolicy: "Always"
  resources:
    {{ .Values.resources.notesBackend | toYaml | nindent 4 }}
  service:
@@ -151,16 +131,10 @@ frontend:
    repository: {{ .Values.images.notesFrontend.repository | quote }}
    pullPolicy: "IfNotPresent"
    tag: {{ .Values.images.notesFrontend.tag | quote }}
-  ingress:
-    enabled: true
-    annotations:
-      {{ .Values.annotations.notesFrontend.ingress | toYaml | nindent 6 }}
-    ingressClassName: {{ .Values.ingress.ingressClassName }}
  ingressMedia:
    enabled: true
    annotations:
      {{ .Values.annotations.notesFrontend.ingressMedia | toYaml | nindent 6 }}
-    ingressClassName: {{ .Values.ingress.ingressClassName }}
  extraEnvVars:
    - name: "ICS_BASE_URL"
      value: {{ printf "https://%s.%s" .Values.global.hosts.intercomService .Values.global.domain | quote }}
@@ -171,26 +145,10 @@ frontend:
  resources:
    {{ .Values.resources.notesFrontend | toYaml | nindent 4 }}
  containerSecurityContext:
-    allowPrivilegeEscalation: false
-    capabilities:
-      drop:
-        - "ALL"
-    enabled: true
-    privileged: false
-    runAsUser: 1000
-    runAsGroup: 1000
-    seccompProfile:
-      type: "RuntimeDefault"
-    readOnlyRootFilesystem: true
-    runAsNonRoot: true
    seLinuxOptions:
      {{ .Values.seLinuxOptions.notesFrontend | toYaml | nindent 6 }}
  podAnnotations:
    {{ .Values.annotations.notesFrontend.pod | toYaml | nindent 4 }}
-  podSecurityContext:
-    enabled: true
-    fsGroup: 1000
-    fsGroupChangePolicy: "Always"
  service:
    annotations:
      {{ .Values.annotations.notesFrontend.service | toYaml | nindent 6 }}
@@ -223,34 +181,16 @@ y-provider:
      subPath: "ca-certificates.crt"
  {{- end }}
  containerSecurityContext:
-    allowPrivilegeEscalation: false
-    capabilities:
-      drop:
-        - "ALL"
-    enabled: true
-    privileged: false
-    runAsUser: 1001
-    runAsGroup: 1001
-    seccompProfile:
-      type: "RuntimeDefault"
-    readOnlyRootFilesystem: true
-    runAsNonRoot: true
    seLinuxOptions:
      {{ .Values.seLinuxOptions.notesBackend | toYaml | nindent 6 }}
  ingressCollaborationApi:
    annotations:
      {{ .Values.annotations.notesYProvider.ingressCollaborationAPI | toYaml | nindent 6 }}
-    ingressClassName: {{ .Values.ingress.ingressClassName }}
  ingressCollaborationWs:
    annotations:
      {{ .Values.annotations.notesYProvider.ingressCollaborationWS | toYaml | nindent 6 }}
-    ingressClassName: {{ .Values.ingress.ingressClassName }}
  podAnnotations:
    {{ .Values.annotations.notesYProvider.pod | toYaml | nindent 4 }}
-  podSecurityContext:
-    enabled: true
-    fsGroup: 1001
-    fsGroupChangePolicy: "Always"
  service:
    annotations:
      {{ .Values.annotations.notesYProvider.service | toYaml | nindent 6 }}
--- a/helmfile/apps/nubus/values-nubus.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-nubus.yaml.gotmpl
@@ -550,7 +550,7 @@ nubusKeycloakExtensions:
      newDeviceLoginNotificationEnable: {{ if .Values.functional.authentication.newDeviceLoginNotification.enabled }}"True"{{ else }}"False"{{ end }}
      logLevel: {{ if .Values.debug.enabled }}"DEBUG"{{ else }}"WARN"{{ end }}
      newDeviceLoginSubject: "New device login on your {{ .Values.theme.texts.productName }} account"
-      mailFrom: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.mailDomain | default .Values.global.domain }}"
+      mailFrom: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}"
    image:
      registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusKeycloakExtensionHandler.registry | quote }}
      repository: {{ .Values.images.nubusKeycloakExtensionHandler.repository }}
@@ -1128,6 +1128,13 @@ nubusProvisioning:

 nubusUdmListener:
  enabled: true
+  # Temporary local liveness probe, should be removed once available in the upstream Nubus Helm chart
+  livenessProbe:
+    exec:
+      command:
+        - sh
+        - -c
+        - 'grep -E "^[13]$" /var/lib/univention-directory-listener/handlers/ldap_listener'
  containerSecurityContext:
    allowPrivilegeEscalation: false
    capabilities:
--- a/helmfile/apps/open-xchange/values-dovecot-enterprise.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-dovecot-enterprise.yaml.gotmpl
@@ -24,6 +24,9 @@ dovecot:
    username: {{ .Values.databases.dovecotDictmap.username | quote }}
    password:
      value: {{ .Values.secrets.cassandra.dovecotDictmapUser | quote }}
+      existingSecret:
+        name: {{ .Values.externalSecrets.dovecot.dictmapUser.name | quote }}
+        key: {{ .Values.externalSecrets.dovecot.dictmapUser.key | quote }}
    keyspace: {{ .Values.databases.dovecotDictmap.name | quote }}
  sharedMailboxes:
    enabled: true
@@ -32,16 +35,28 @@ dovecot:
    username: {{ .Values.databases.dovecotACL.username | quote }}
    password:
      value: {{ .Values.secrets.cassandra.dovecotACLUser | quote }}
+      existingSecret:
+        name: {{ .Values.externalSecrets.dovecot.aclUser.name | quote }}
+        key: {{ .Values.externalSecrets.dovecot.aclUser.key | quote }}
    keyspace: {{ .Values.databases.dovecotACL.name | quote }}
  objectStorage:
    bucket: {{ .Values.objectstores.dovecot.bucket | quote }}
    encryption:
      privateKey:
        value: {{ requiredEnv "DOVECOT_CRYPT_PRIVATE_KEY" | quote }}
+        existingSecret:
+          name: {{ .Values.externalSecrets.dovecot.objectStorage.encryption.privateKey.name | quote }}
+          key: {{ .Values.externalSecrets.dovecot.objectStorage.encryption.privateKey.key | quote }}
      publicKey:
        value: {{ requiredEnv "DOVECOT_CRYPT_PUBLIC_KEY" | quote }}
+        existingSecret:
+          name: {{ .Values.externalSecrets.dovecot.objectStorage.encryption.publicKey.name | quote }}
+          key: {{ .Values.externalSecrets.dovecot.objectStorage.encryption.publicKey.key | quote }}
    fqdn: {{ .Values.objectstores.dovecot.endpoint | default (printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain) | quote }}
    username: {{ .Values.objectstores.dovecot.username | quote }}
    password:
      value: {{ .Values.objectstores.dovecot.secretKey | default .Values.secrets.minio.dovecotUser | quote }}
+      existingSecret:
+        name: {{ .Values.externalSecrets.objectstores.dovecotUser.name | quote }}
+        key: {{ .Values.externalSecrets.objectstores.dovecotUser.key | quote }}
 ...
--- a/helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl
@@ -25,10 +25,16 @@ dovecot:
  defaultMailDomain: {{ .Values.global.mailDomain | default .Values.global.domain | quote }}
  password:
    value: {{ .Values.secrets.dovecot.doveadm | quote }}
+    existingSecret:
+      name: {{ .Values.externalSecrets.dovecot.doveadm.name | quote }}
+      key: {{ .Values.externalSecrets.dovecot.doveadm.key | quote }}
  migration:
    enabled: {{ .Values.functional.migration.oxAppSuite.enabled }}
    masterPassword:
      value: {{ .Values.secrets.oxAppSuite.migrationsMasterPassword | quote }}
+      existingSecret:
+        name: {{ .Values.externalSecrets.oxAppSuite.migrationsMasterPassword.name | quote }}
+        key: {{ .Values.externalSecrets.oxAppSuite.migrationsMasterPassword.key | quote }}
  ldap:
    enabled: true
    host: {{ .Values.ldap.host | quote }}
@@ -37,24 +43,22 @@ dovecot:
    dn: "uid=ldapsearch_dovecot,cn=users,{{ .Values.ldap.baseDn }}"
    password:
      value: {{ .Values.secrets.nubus.ldapSearch.dovecot | quote }}
-  loginTrustedNetworks: {{ join " " .Values.cluster.networking.cidr | quote }}
+      existingSecret:
+        name: {{ .Values.externalSecrets.nubus.ldapSearch.dovecot.name | quote }}
+        key: {{ .Values.externalSecrets.nubus.ldapSearch.dovecot.key | quote }}
  oidc:
    enabled: true
    clientID:
      value: "opendesk-dovecot"
    clientSecret:
      value: {{ .Values.secrets.keycloak.clientSecret.dovecot | quote }}
+      existingSecret:
+        name: {{ .Values.externalSecrets.keycloak.clientSecret.dovecot.name | quote }}
+        key: {{ .Values.externalSecrets.keycloak.clientSecret.dovecot.key | quote }}
    introspectionHost: {{ printf "%s.%s" .Values.global.hosts.keycloak .Values.global.domain | quote }}
    introspectionPath: "/realms/{{ .Values.platform.realm }}/protocol/openid-connect/token/introspect"
    usernameAttribute: "opendesk_username"
-  quotaRules:
-    - "*:storage={{ mul .Values.functional.groupware.quota.default 1024 }}M"
-    - "Trash:storage=+{{ div (mul (mul .Values.functional.groupware.quota.default 1024) 20) 100 }}M"
-    - "LAZY_EXPUNGE:ignore"
-  quotaGrace: "{{ div (mul (mul .Values.functional.groupware.quota.default 1024) 10) 100 }}M"
-  sieve:
-    notify:
-      mailtoEnvelopeFrom: "orig_recipient"
+  loginTrustedNetworks: {{ join " " .Values.cluster.networking.cidr | quote }}
  submission:
    enabled: true
    ssl: "no"
--- a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
@@ -502,9 +502,6 @@ appsuite:
      com.openexchange.carddav.url: {{ printf "https://%s.%s/carddav/[folderId]" .Values.global.hosts.openxchangeDav .Values.global.domain }}
      com.openexchange.client.onboarding.caldav.url: {{ printf "https://%s.%s/" .Values.global.hosts.openxchangeDav .Values.global.domain }}
      com.openexchange.client.onboarding.carddav.url: {{ printf "https://%s.%s/" .Values.global.hosts.openxchangeDav .Values.global.domain }}
-      {{- else }}
-      com.openexchange.caldav.enabled: "false"
-      com.openexchange.carddav.enabled: "false"
      {{- end }}
      # Other
      com.openexchange.secret.secretSource: "\"<user-id> + '@' + <context-id> + '/' + <random>\""
@@ -548,6 +545,13 @@ appsuite:
        MASTER_ACCOUNT_OVERRIDE: "true"
      /opt/open-xchange/etc/AdminUser.properties:
        USERNAME_CHANGEABLE: "true"
+      /opt/open-xchange/etc/system.properties:
+        SERVER_NAME: "oxserver"
+      /opt/open-xchange/etc/ldapauth.properties:
+        java.naming.provider.url: "ldap://{{ .Values.ldap.host }}:389/{{ .Values.ldap.baseDn }}"
+        bindDN: "uid=ldapsearch_ox,cn=users,{{ .Values.ldap.baseDn }}"
+        bindDNPassword: {{ .Values.secrets.nubus.ldapSearch.ox | quote }}
+        bindOnly: "false"
      /opt/open-xchange/etc/antivirus.properties:
        com.openexchange.antivirus.enabled: "true"
        {{- if .Values.antivirus.icap.host }}
@@ -567,20 +571,6 @@ appsuite:
        com.openexchange.filestore.s3.ox-filestore-s3.bucketName: {{ .Values.objectstores.openxchange.bucket | quote }}
        com.openexchange.filestore.s3.ox-filestore-s3.accessKey: {{ .Values.objectstores.openxchange.username | quote }}
        com.openexchange.filestore.s3.ox-filestore-s3.secretKey: {{ .Values.objectstores.openxchange.secretKey | default .Values.secrets.minio.openxchangeUser | quote }}
-      /opt/open-xchange/etc/ldapauth.properties:
-        java.naming.provider.url: "ldap://{{ .Values.ldap.host }}:389/{{ .Values.ldap.baseDn }}"
-        bindDN: "uid=ldapsearch_ox,cn=users,{{ .Values.ldap.baseDn }}"
-        bindDNPassword: {{ .Values.secrets.nubus.ldapSearch.ox | quote }}
-        bindOnly: "false"
-      /opt/open-xchange/etc/noreply.properties:
-        com.openexchange.noreply.address: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.mailDomain | default .Values.global.domain }}"
-        com.openexchange.noreply.login: {{ printf "%s@%s" "opendesk-system" ( .Values.global.mailDomain | default .Values.global.domain ) }}
-        com.openexchange.noreply.password: {{ .Values.secrets.postfix.opendeskSystemPassword | quote }}
-        com.openexchange.noreply.server: "postfix"
-        com.openexchange.noreply.port: "25"
-        com.openexchange.noreply.secureMode: "plain"
-      /opt/open-xchange/etc/system.properties:
-        SERVER_NAME: "oxserver"
    uiSettings:
      io.ox.nextcloud//server: "https://{{ .Values.global.hosts.intercomService }}.{{ .Values.global.domain }}/fs/"
      io.ox.public-sector//ics/url: "https://{{ .Values.global.hosts.intercomService }}.{{ .Values.global.domain }}/"
@@ -620,8 +610,6 @@ appsuite:
      io.ox/dynamic-theme//folderBackground: {{ .Values.theme.colors.white | quote }}
      io.ox/dynamic-theme//folderSelected: {{ .Values.theme.colors.primary15 | quote }}
      io.ox/dynamic-theme//folderHover: {{ .Values.theme.colors.secondaryGreyLight | quote }}
-      # openDesk logo in top bar links to portal
-      io.ox/core//logoAction: {{ printf "https://%s.%s" .Values.global.hosts.nubus .Values.global.domain | quote }}
    secretETCFiles:
      # Format of the OX Guard master key:
      # MC+base64(20 random bytes)
--- a/helmfile/apps/open-xchange/values-postfix.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-postfix.yaml.gotmpl
@@ -62,8 +62,14 @@ postfix:
    authentication:
      username:
        value: {{ .Values.smtp.username }}
+        existingSecret:
+          name: {{ .Values.externalSecrets.smtp.username.name | quote }}
+          key: {{ .Values.externalSecrets.smtp.username.key | quote }}
      password:
        value: {{ .Values.smtp.password }}
+        existingSecret:
+          name: {{ .Values.externalSecrets.smtp.password.name | quote }}
+          key: {{ .Values.externalSecrets.smtp.password.key | quote }}
  {{- end }}
  allowRelayNets: false
  smtpSASLAuthEnable: "yes"
--- a/helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl
+++ b/helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl
@@ -27,7 +27,7 @@ assets:
    paths:
      - path: "/resources/...../login/UCS/img/favicon.ico"
        data: {{ .Values.theme.imagery.login.faviconIco }}
-      - path: "/opendesk-static-files/login/logo.svg"
+      - path: "/static-files/login/logo.svg"
        data: {{ .Values.theme.imagery.login.logoSvg }}
  nextcloud:
    subdomain: {{ .Values.global.hosts.nextcloud }}
@@ -36,18 +36,11 @@ assets:
        data: {{ .Values.theme.imagery.files.faviconPng }}
      - path: "/core/img/favicon.ico"
        data: {{ .Values.theme.imagery.files.faviconIco }}
-      - path: "/apps/integration_swp/logo"
-        data: {{ .Values.theme.imagery.logoHeaderSvgB64 }}
-        mimeType: "image/svg+xml"
  notes:
    subdomain: {{ .Values.global.hosts.notes }}
    paths:
      - path: "/favicon.ico"
        data: {{ .Values.theme.imagery.notes.faviconIco }}
-      - path: "/favicon.png"
-        data: {{ .Values.theme.imagery.notes.faviconPng }}
-      - path: "/favicon-dark.png"
-        data: {{ .Values.theme.imagery.notes.faviconPng }}
  openproject:
    subdomain: {{ .Values.global.hosts.openproject }}
    paths:
@@ -71,6 +64,7 @@ assets:
        data: {{ .Values.theme.imagery.portal.waitingSpinnerSvg }}
      - path: "/static-files/login/background.jpg"
        data: {{ .Values.theme.imagery.login.backgroundJpg }}
+
  xwiki:
    subdomain: {{ .Values.global.hosts.xwiki }}
    paths:
--- a/helmfile/apps/openproject/values.yaml.gotmpl
+++ b/helmfile/apps/openproject/values.yaml.gotmpl
@@ -82,7 +82,7 @@ environment:
  OPENPROJECT_SMTP__AUTHENTICATION: "cram_md5"
  OPENPROJECT_SMTP__ENABLE__STARTTLS__AUTO: "true"
  OPENPROJECT_SMTP__OPENSSL__VERIFY__MODE: "none"
-  OPENPROJECT_MAIL__FROM: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.mailDomain | default .Values.global.domain }}"
+  OPENPROJECT_MAIL__FROM: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}"
  OPENPROJECT_HOME__URL: {{ printf "https://%s.%s/" .Values.global.hosts.nubus .Values.global.domain | quote }}
  OPENPROJECT_OPENID__CONNECT_KEYCLOAK_ISSUER: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}"
  OPENPROJECT_OPENID__CONNECT_KEYCLOAK_POST__LOGOUT__REDIRECT__URI: "https://{{ .Values.global.hosts.openproject }}.{{ .Values.global.domain }}/"
--- a/helmfile/apps/services-external/values-postfix.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-postfix.yaml.gotmpl
@@ -66,8 +66,14 @@ postfix:
    authentication:
      username:
        value: {{ .Values.smtp.username }}
+        existingSecret:
+          name: {{ .Values.externalSecrets.smtp.username.name | quote }}
+          key: {{ .Values.externalSecrets.smtp.username.key | quote }}
      password:
        value: {{ .Values.smtp.password }}
+        existingSecret:
+          name: {{ .Values.externalSecrets.smtp.password.name | quote }}
+          key: {{ .Values.externalSecrets.smtp.password.key | quote }}
  {{- end }}
  # Warning: This setting allows unauthenticated mail relay from relayNets!
  allowRelayNets: true
@@ -91,8 +97,14 @@ postfix:
    enabled: true
    username:
      value: "opendesk-system"
+      existingSecret:
+        name: {{ .Values.externalSecrets.postfix.opendeskSystemUsername.name | quote }}
+        key: {{ .Values.externalSecrets.postfix.opendeskSystemUsername.key | quote }}
    password:
      value: {{ .Values.secrets.postfix.opendeskSystemPassword | quote }}
+      existingSecret:
+        name: {{ .Values.externalSecrets.postfix.opendeskSystemPassword.name | quote }}
+        key: {{ .Values.externalSecrets.postfix.opendeskSystemPassword.key | quote }}

  {{- if .Values.antivirus.milter.host }}
  smtpdMilters: "inet:{{ .Values.antivirus.milter.host }}:{{ .Values.antivirus.milter.port }}"
--- a/helmfile/apps/xwiki/values.yaml.gotmpl
+++ b/helmfile/apps/xwiki/values.yaml.gotmpl
@@ -16,8 +16,7 @@ image:
  {{- fail "Unsupported value for .Values.databases.xwiki.type, supported values are 'mariadb' or 'postgresql'" }}
  {{- end }}
  pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-imagePullSecrets:
-  {{ .Values.global.imagePullSecrets | toYaml | nindent 2 }}
+imagePullSecrets: {{ .Values.global.imagePullSecrets }}

 javaOpts:
  {{- if and (eq (env "OPENDESK_ENTERPRISE") "true") .Values.enterpriseKeys.xwiki.opendeskEnterpriseLicense .Values.enterpriseKeys.xwiki.proApplicationslicense }}
@@ -172,7 +171,7 @@ properties:
  # therefore on XWiki restart an LDAP sync is triggered to load the dynamic mapping.
  "property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.ldap_group_mapping": "xwiki:XWiki.XWikiAdminGroup=cn=managed-by-attribute-KnowledgemanagementAdmin,cn=groups,{{ .Values.ldap.baseDn }}"
  ## SMTP settings
-  "property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.from": "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.mailDomain | default .Values.global.domain }}"
+  "property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.from": "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}"
  "property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.host": {{ printf "%s.%s.svc.%s" "postfix" (.Values.apps.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
  "property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.port": 587
  "property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.properties": "mail.smtp.starttls.enable=true"
--- a/helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl
+++ b/helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl
@@ -6,7 +6,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "zendis/opendesk-enterprise/components/product-development/charts/opendesk-dovecot-pro"
    name: "dovecot"
-    version: "3.1.8"
+    version: "3.1.1"
    verify: true
  oxAppSuite:
    registry: "registry.opencode.de"
--- a/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl
+++ b/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl
@@ -5,7 +5,8 @@ images:
  collabora:
    registry: "registry.opencode.de"
    repository: "zendis/opendesk-enterprise/components/supplier/collabora/images/collabora-online-for-opendesk"
-    tag: "25.04.4.3.1@sha256:b0b5fa9b061df1e8473dff9bb2cf295ab41bd7b35a78b785de518883b07e97c2"
+    tag: "25.04.3.4.1@sha256:929ce210bb1ff46275af64e94ce02ab0a0470572eba8251ad35b8b4296c3a171"
+
  dovecot:
    registry: "registry.opencode.de"
    repository: "zendis/opendesk-enterprise/components/supplier/open-xchange/images-mirror/dovecot-pro"
@@ -13,7 +14,7 @@ images:
  nextcloud:
    registry: "registry.opencode.de"
    repository: "zendis/opendesk-enterprise/components/supplier/nextcloud/images/opendesk-nextcloud"
-    tag: "1.6.3@sha256:2a60cf286952f7762ddb32c3de2bb1359a657d739b507f8b077504fe5d0c7c11"
+    tag: "31.0.6@sha256:07cd284179654739c8e6aea05e960ee7d3e3eb4cd09bd9a3e3747c69b9e2ec22"
  openxchangeCoreMW:
    registry: "registry.opencode.de"
    repository: "zendis/opendesk-enterprise/components/supplier/open-xchange/images-mirror/middleware-public-sector-pro"
--- a/helmfile/environments/default/annotations.yaml.gotmpl
+++ b/helmfile/environments/default/annotations.yaml.gotmpl
@@ -134,7 +134,6 @@ annotations:
    pod: ~
    service: ~
  notesFrontend:
-    ingress: ~
    ingressMedia: ~
    pod: ~
    service: ~
--- a/helmfile/environments/default/charts.yaml.gotmpl
+++ b/helmfile/environments/default/charts.yaml.gotmpl
@@ -97,7 +97,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/charts/opendesk-dovecot"
    name: "dovecot"
-    version: "3.1.5"
+    version: "3.1.1"
    verify: true
  element:
    # providerCategory: "Platform"
@@ -149,7 +149,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/charts/opendesk-jitsi"
    name: "opendesk-jitsi"
-    version: "3.2.0"
+    version: "3.1.0"
    verify: true
  mariadb:
    # providerCategory: "Platform"
@@ -249,7 +249,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud"
    name: "opendesk-nextcloud"
-    version: "4.4.1"
+    version: "4.4.0"
    verify: true
  nextcloudManagement:
    # providerCategory: "Platform"
@@ -259,7 +259,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud"
    name: "opendesk-nextcloud-management"
-    version: "4.4.1"
+    version: "4.4.0"
    verify: true
  nextcloudNotifyPush:
    # providerCategory: "Platform"
@@ -269,7 +269,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud"
    name: "opendesk-nextcloud-notifypush"
-    version: "4.4.1"
+    version: "4.4.0"
    verify: true
  nginx:
    # providerCategory: "Community"
@@ -351,7 +351,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/charts/opendesk-static-files"
    name: "opendesk-static-files"
-    version: "4.1.0"
+    version: "4.0.1"
    verify: true
  openproject:
    # providerCategory: "Supplier"
@@ -417,7 +417,7 @@ charts:
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
    name: "ox-connector"
-    version: "0.27.7"
+    version: "0.27.2"
    verify: true
  postfix:
    # providerCategory: "Platform"
--- a/helmfile/environments/default/external_secrets.yaml.gotmpl
+++ b/helmfile/environments/default/external_secrets.yaml.gotmpl
@@ -0,0 +1,56 @@
+# SPDX-FileCopyrightText: 2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+# SPDX-License-Identifier: Apache-2.0
+# The variables set in this file are required to upgrade components to their "Enterprise" product variant.
+---
+externalSecrets:
+  dovecot:
+    aclUser:
+      name: ~
+      key: ~
+    dictmapUser:
+      name: ~
+      key: ~
+    doveadm:
+      name: ~
+      key: ~
+    objectStorage:
+      encryption:
+        privateKey:
+          name: ~
+          key: ~
+        publicKey:
+          name: ~
+          key: ~
+  keycloak:
+    clientSecret:
+      dovecot:
+        name: ~
+        key: ~
+  nubus:
+    ldapSearch:
+      dovecot:
+        name: ~
+        key: ~
+  objectstores:
+    dovecotUser:
+      name: ~
+      key: ~
+  oxAppSuite:
+    migrationsMasterPassword:
+      name: ~
+      key: ~
+  postfix:
+    opendeskSystemPassword:
+      name: ~
+      key: ~
+    opendeskSystemUsername:
+      name: ~
+      key: ~
+  smtp:
+    password:
+      name: ~
+      key: ~
+    username:
+      name: ~
+      key: ~
+...
--- a/helmfile/environments/default/functional.yaml.gotmpl
+++ b/helmfile/environments/default/functional.yaml.gotmpl
@@ -100,7 +100,7 @@ functional:

  filestore:
    quota:
-      # Set the default quota for all users in gigabyte
+      # Set the default quota for all users in GB
      default: 1
    # Options related to file sharing.
    # Changing these options might require a restart of the `opendesk-nextcloud-php` Pod(s).
@@ -152,11 +152,6 @@ functional:
      # - https://<.Values.global.hosts.openxchangeDav>.<.Values.global.domain>/carddav/[folderId]"
      # Can be switched off using the below feature toggle.
      enabled: true
-    quota:
-      # Set the default mail storage quota for users in gigabyte.
-      # Just provide the plain number without quoting. It will allow a quota grace of 10% and +20% in trash storage.
-      # If you need different rules you can use customizing on Dovecot's `quotaRules` and `quotaGrace` templating.
-      default: 1

  migration:
    oxAppSuite:
--- a/helmfile/environments/default/global.generated.yaml.gotmpl
+++ b/helmfile/environments/default/global.generated.yaml.gotmpl
@@ -3,5 +3,5 @@
 ---
 global:
  systemInformation:
-    releaseVersion: "v1.7.1"
+    releaseVersion: "v1.7.0"
 ...
--- a/helmfile/environments/default/global.yaml.gotmpl
+++ b/helmfile/environments/default/global.yaml.gotmpl
@@ -63,7 +63,7 @@ global:
    whiteboard: "whiteboard"
    xwiki: "wiki"

-  ## Define a list containing names of the secrets to use when fetching images from private registries.
+  ## Credentials to fetch images from private registry
  ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
  #
  imagePullSecrets: []
--- a/helmfile/environments/default/images.yaml.gotmpl
+++ b/helmfile/environments/default/images.yaml.gotmpl
@@ -50,7 +50,7 @@ images:
    # upstreamRepository: "bmi/opendesk/components/supplier/collabora/images/collabora-online-for-opendesk"
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/collabora/images/collabora-online-for-opendesk"
-    tag: "25.04.4.3.1@sha256:2ba934fb0dc18965bfaf19151017205b0a85af8b069bc34c994a8eae0b4bee34"
+    tag: "25.04.3.2.1@sha256:e2940b19d855bf6e557c445aaf5b2b7db978af9aeae7e6400bfcc99411dd8bb9"
  collaboraController:
    # Enterprise Component
    # providerCategory: "Supplier"
@@ -332,7 +332,7 @@ images:
    # upstreamRepository: "bmi/opendesk/components/platform-development/images/opendesk-nextcloud"
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/platform-development/images/opendesk-nextcloud"
-    tag: "2.10.3@sha256:93fc967cebb24508b5903c15a83af5c038aa006a5c091a41a7bcd81ae14a69bb"
+    tag: "31.0.6@sha256:4b99dc24ac61db1e5159fbb63e4c9f4178155fba821a9f5552060264b3dd6e31"
  nextcloudExporter:
    # providerCategory: "Platform"
    # providerResponsible: "openDesk"
@@ -590,7 +590,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "10", "0"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/ox-extension"
-    tag: "0.27.7@sha256:c0ec68bbd79707de8f4d8efe7aa2b0d907ea3207865fed7a0c8e8ef1806ef70d"
+    tag: "0.27.2@sha256:7bb54f5ae0e797172fb92bd7a8a479f179ebd51c1fb5af98fa7b6025f9ffaca4"
  nubusPortalConsumer:
    # providerCategory: "Supplier"
    # providerResponsible: "Univention"
@@ -908,7 +908,7 @@ images:
    # upstreamMirrorStartFrom: ["0", "4", "2"]
    registry: "registry.opencode.de"
    repository: "bmi/opendesk/components/supplier/univention/images-mirror/ox-connector-standalone"
-    tag: "0.27.7@sha256:de5153eca1607686f7c42e8bfc89103d346947e779e40c4f63992009a3ee2fef"
+    tag: "0.27.2@sha256:4753a1d4a01acb7c6946fc9c8596fd328afe0d3c0b3098adfe85cef89fb1b7d7"
  postfix:
    # providerCategory: "Platform"
    # providerResponsible: "openDesk"
--- a/helmfile/environments/default/theme.yaml.gotmpl
+++ b/helmfile/environments/default/theme.yaml.gotmpl
@@ -68,7 +68,6 @@ theme:

    notes:
      faviconIco: {{ readFile "./../../files/theme/notes/favicon.ico" | b64enc | quote }}
-      faviconPng: {{ readFile "./../../files/theme/notes/favicon.png" | b64enc | quote }}

    portal:
      faviconIco: {{ readFile "./../../files/theme/portal/favicon/favicon.ico" | b64enc | quote }}
@@ -77,9 +76,9 @@ theme:
      appleTouchIcon: {{ readFile "./../../files/theme/portal/favicon/apple-touch-icon.png" | b64enc | quote }}
      webManifestIcon192: {{ readFile "./../../files/theme/portal/favicon/web-app-manifest-192x192.png" | b64enc | quote }}
      webManifestIcon512: {{ readFile "./../../files/theme/portal/favicon/web-app-manifest-512x512.png" | b64enc | quote }}
+
      waitingSpinnerSvg: {{ readFile "./../../files/theme/portal/waiting-spinner.svg" | b64enc | quote }}
      backgroundSvg: {{ readFile "./../../files/theme/portal/background.svg" | b64enc | quote }}
-
    portalTiles:
      adminAnnouncement: {{ readFile "./../../files/theme/admin_announcements/favicon.svg" | b64enc | quote }}
      adminFunctionalmailbox: {{ readFile "./../../files/theme/admin_functionalmailbox/favicon.svg" | b64enc | quote }}
--- a/helmfile/files/theme/portal/stylesheet.css
+++ b/helmfile/files/theme/portal/stylesheet.css
@@ -94,7 +94,7 @@
  --select-arrow: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAXCAYAAADgKtSgAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAABkSURBVHgB7Y3BCQAhDAS3BEtICVeCJdi5JVwpGsGHiGLECD4ysL9lBjCMpwk8En6p/kV4XuL9WAeo/sr/gwDHi4JAK47YYBXoxQ6bzALH4lnAa4lHgaQpHgVUxW0g4ILYMC6TAZ0BJA3bxN3RAAAAAElFTkSuQmCC');
  --layout-height-header: 63px;
  /* Keycloak user screens logo */
-  --login-logo: url("/opendesk-static-files/login/logo.svg") no-repeat center;
+  --login-logo: url("/static-files/login/logo.svg") no-repeat center;
 }

 button {
--- a/publiccode.yml
+++ b/publiccode.yml
@@ -22,8 +22,8 @@ name: "openDesk"
 platforms:
  - "web"
 developmentStatus: "stable"
-softwareVersion: "1.7.1"
-releaseDate: "2025-08-26"
+softwareVersion: "1.7.0"
+releaseDate: "2025-08-11"
 softwareType: "standalone/web"
 url: "https://gitlab.opencode.de/bmi/opendesk/"
 logo: ".opencode/openDesk-logo-rgb-color.svg"
Author	SHA1	Message	Date
Axel Lender	f505f82916	fix(gotmpl): Sort values for existing secrets Signed-off-by: Axel Lender <lender@b1-systems.de>	2025-08-12 14:27:31 +02:00
Axel Lender	dab833fa04	feat(helmfile): Template SMTP credentials as external secrets for Postfix Signed-off-by: Axel Lender <lender@b1-systems.de>	2025-08-12 08:22:31 +02:00
Axel Lender	528fd704d0	fix(helmfile): Adap to existing naming Signed-off-by: Axel Lender <lender@b1-systems.de>	2025-08-11 20:46:22 +02:00
Thomas Kaltenbrunner	636b926c88	fix(open-xchange): Add external secrets for Dovecot and Postfix	2025-08-11 20:46:22 +02:00