From 5f58a857acab38fa7f56e1e14ef0a6f805c7622e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20Ro=C3=9Fner?= Date: Fri, 25 Apr 2025 11:19:10 +0200 Subject: [PATCH] feat(helmfile): Option to select default file format for weboffice using; see `functional.weboffice.defaultFormat` in `functional.yaml.gotmpl` for details --- docs/migrations.md | 2 +- .../values-nextcloud-mgmt.yaml.gotmpl | 1 + helmfile/apps/nubus/values-nubus.yaml.gotmpl | 9 +++ .../images.yaml.gotmpl | 2 +- .../environments/default/charts.yaml.gotmpl | 4 +- .../default/functional.yaml.gotmpl | 61 +++++++++++-------- .../environments/default/images.yaml.gotmpl | 4 +- 7 files changed, 50 insertions(+), 33 deletions(-) diff --git a/docs/migrations.md b/docs/migrations.md index 7d8d7695..e5a539c0 100644 --- a/docs/migrations.md +++ b/docs/migrations.md @@ -84,7 +84,7 @@ To upgrade existing deployments, you cannot skip any version mentioned in the co | Mandatory version | | ----------------- | -| v1.2+ | + | v1.1.x | | v1.0.0 | | v0.9.0 | diff --git a/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl b/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl index 632821d0..d908cb1d 100644 --- a/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl +++ b/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl @@ -75,6 +75,7 @@ configuration: collabora: # internalWopiUrl: "" wopiAllowlist: {{ join ", " ( concat .Values.cluster.networking.cidr .Values.cluster.networking.incomingCIDR ) | quote }} + defaultFormat: {{ .Values.functional.weboffice.defaultFormat | quote }} database: {{ if eq .Values.databases.nextcloud.type "mariadb" }} diff --git a/helmfile/apps/nubus/values-nubus.yaml.gotmpl b/helmfile/apps/nubus/values-nubus.yaml.gotmpl index 6469097f..e4bbc2e7 100644 --- a/helmfile/apps/nubus/values-nubus.yaml.gotmpl +++ b/helmfile/apps/nubus/values-nubus.yaml.gotmpl @@ -1472,6 +1472,15 @@ nubusStackDataUms: opendeskAdminAttributes: true opendeskGroupAttributes: true opendeskUserAttributes: true + {{- if eq .Values.functional.weboffice.defaultFormat "OOXML"}} + portalDirectDocsExtensionText: "docx" + portalDirectDocsExtensionSheet: "xlsx" + portalDirectDocsExtensionPresentation: "pptx" + {{- else }} + portalDirectDocsExtensionText: "odt" + portalDirectDocsExtensionSheet: "ods" + portalDirectDocsExtensionPresentation: "odp" + {{- end }} portalEnforceLogin: {{ .Values.functional.portal.enforceLogin }} portalHeaderLogo: {{ toYaml .Values.theme.imagery.logoHeaderSvgB64 | quote }} portalTiles: {{ toYaml .Values.theme.imagery.portalTiles | nindent 6 }} diff --git a/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl b/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl index 6b3eef82..37590c27 100644 --- a/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl +++ b/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl @@ -13,7 +13,7 @@ images: nextcloud: registry: "registry.opencode.de" repository: "zendis/opendesk-enterprise/components/supplier/nextcloud/images/opendesk-nextcloud" - tag: "1.1.9@sha256:ad28c9dd8cdb4bdd325fe132215d0cf094392c3ddd1f114707b09bb7d1c61a9e" + tag: "1.2.0@sha256:ddd2bec74a22a713967f62fcdcf18fa8d53d730c1db296d570143754c93d20a5" openxchangeCoreMW: registry: "registry.opencode.de" repository: "zendis/opendesk-enterprise/components/supplier/open-xchange/images-mirror/middleware-public-sector-pro" diff --git a/helmfile/environments/default/charts.yaml.gotmpl b/helmfile/environments/default/charts.yaml.gotmpl index 3ce68fbc..3999b855 100644 --- a/helmfile/environments/default/charts.yaml.gotmpl +++ b/helmfile/environments/default/charts.yaml.gotmpl @@ -251,7 +251,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud" name: "opendesk-nextcloud" - version: "4.0.3" + version: "4.1.0" verify: true nextcloudManagement: # providerCategory: "Platform" @@ -261,7 +261,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud" name: "opendesk-nextcloud-management" - version: "4.0.3" + version: "4.1.0" verify: true nginx: # providerCategory: "Community" diff --git a/helmfile/environments/default/functional.yaml.gotmpl b/helmfile/environments/default/functional.yaml.gotmpl index d1fd7890..8815005d 100644 --- a/helmfile/environments/default/functional.yaml.gotmpl +++ b/helmfile/environments/default/functional.yaml.gotmpl @@ -2,6 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 --- functional: + admin: portal: deploymentTimestamp: @@ -62,6 +63,19 @@ functional: # - `internalId` idpDetails: {} + chat: + matrix: + profile: + # Once connected with a user that user's Matrix ID is rarely checked by their communication partners, as the + # display name is used to see whom they are communicating with. Not allowing users to change their + # own display name reduces the risk of identity fraud. + # To get the display name updated from the central identity and access management you have to have the Synapse + # enterprise feature "groupsync" configured. + allowUsersToUpdateDisplayname: true + + # If the LDAP entryUUID should be used for the localpart of user's Matrix IDs following setting must be `true`. + useImmutableIdentifierForLocalpart: false + externalServices: nubus: udmRestApi: @@ -74,6 +88,16 @@ functional: # List of matrix homeserver domains you want to allow federation with domainAllowList: [] + dataProtection: + matrixPresence: + # Enable to allow information about the user presence status to be shared. + # Ref.: https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#presence + enabled: false + jitsiRoomHistory: + # Disable to avoid the room history to be stored in the user's browser local storage. + # Ref.: https://github.com/jitsi/docker-jitsi-meet/issues/898 + enabled: true + filestore: quota: # Set the default quota for all users in GB @@ -120,15 +144,12 @@ functional: versions: "auto" # yamllint enable rule:line-length - dataProtection: - matrixPresence: - # Enable to allow information about the user presence status to be shared. - # Ref.: https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#presence + migration: + oxAppSuite: + # Note: Only available in openDesk Enterprise. + # Turn on temporary for migration purposes only. Will enable master password auth in OX AppSuite and Dovecot using + # `secrets.oxAppSuite.migrationsMasterPassword`. enabled: false - jitsiRoomHistory: - # Disable to avoid the room history to be stored in the user's browser local storage. - # Ref.: https://github.com/jitsi/docker-jitsi-meet/issues/898 - enabled: true portal: # Configure if the a re-direct to the login dialogue is enforced, or if the portal is shown and the user as to actively @@ -139,24 +160,10 @@ functional: # Link to the privacy statement shown in the portal menu, set to "~" if you want to remove the link linkPrivacyStatement: "https://zendis.de/datenschutzerklaerung" - chat: - matrix: - profile: - # Once connected with a user that user's Matrix ID is rarely checked by their communication partners, as the - # display name is used to see whom they are communicating with. Not allowing users to change their - # own display name reduces the risk of identity fraud. - # To get the display name updated from the central identity and access management you have to have the Synapse - # enterprise feature "groupsync" configured. - allowUsersToUpdateDisplayname: true - - # If the LDAP entryUUID should be used for the localpart of user's Matrix IDs following setting must be `true`. - useImmutableIdentifierForLocalpart: false - - migration: - oxAppSuite: - # Note: Only available in openDesk Enterprise. - # Turn on temporary for migration purposes only. Will enable master password auth in OX AppSuite and Dovecot using - # `secrets.oxAppSuite.migrationsMasterPassword`. - enabled: false + weboffice: + # Set the file format to be used by default when creating new documents from the portal or the Nextcloud app. + # You can choose between "ODF" and "OOXML". + # Ref.: https://en.wikipedia.org/wiki/Comparison_of_Office_Open_XML_and_OpenDocument + defaultFormat: "ODF" ... diff --git a/helmfile/environments/default/images.yaml.gotmpl b/helmfile/environments/default/images.yaml.gotmpl index 51dc1b2a..596450f9 100644 --- a/helmfile/environments/default/images.yaml.gotmpl +++ b/helmfile/environments/default/images.yaml.gotmpl @@ -327,7 +327,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.4.11@sha256:2fe6e311735c706016fe7b39c8f60a6cf0f0e735761dbc60fb4cd2eedbe135c4" + tag: "2.5.0@sha256:9457bc2116620e52dcd1f5f12f042090aa4cca2a3e4d5f64b7c84c232ca6bb63" nextcloudExporter: # providerCategory: "Platform" # providerResponsible: "openDesk" @@ -537,7 +537,7 @@ images: # upstreamRepository: "bmi/opendesk/components/platform-development/images/opendesk-nubus" registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/images/opendesk-nubus" - tag: "1.13.1@sha256:eb96855b53241bcb1dd64d72d8c76f7ee080291da72e6dff39ed2fc81b8ac99b" + tag: "1.14.0@sha256:66ee00b6e44276f5f1e9d7a8066352fd5772820c50c10381acfd48c97f0acf4a" nubusOpendeskExtensionA2gMapper: # providerCategory: "Platform" # providerResponsible: "openDesk"