From 18fcaa0331c9c94bb2f260f97fbadad44b019bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20Ro=C3=9Fner?= Date: Wed, 27 Nov 2024 08:20:46 +0100 Subject: [PATCH] fix(nextcloud): Update Chart to 3.6.1 and Image to 2.3.3 (including rollback to 29.0.8). Introducing setting for `functional.filestore.sharing.external.sendPasswordMail` --- README.md | 2 +- .../apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl | 4 ++++ helmfile/environments/default/charts.yaml | 4 ++-- helmfile/environments/default/customization.yaml | 10 +++++++++- helmfile/environments/default/functional.yaml | 2 ++ helmfile/environments/default/images.yaml | 2 +- 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7462aa69..ebe5605f 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ openDesk currently features the following functional main components: | -------------------- | --------------------------- | ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | | Chat & collaboration | Element ft. Nordeck widgets | [1.11.67](https://github.com/element-hq/element-desktop/releases/tag/v1.11.67) | [For the most recent release](https://element.io/user-guide) | | Diagram editor | CryptPad ft. diagrams.net | [5.6.0](https://github.com/cryptpad/cryptpad/releases/tag/5.6.0) | [For the most recent release](https://docs.cryptpad.org/en/) | -| File management | Nextcloud | [29.0.9](https://nextcloud.com/de/changelog/#29-0-9) | [Nextcloud 29](https://docs.nextcloud.com/) | +| File management | Nextcloud | [29.0.8](https://nextcloud.com/de/changelog/#29-0-8) | [Nextcloud 29](https://docs.nextcloud.com/) | | Groupware | OX App Suite | [8.30](https://documentation.open-xchange.com/appsuite/releases/8.30/) | Online documentation available from within the installed application; [Additional resources](https://documentation.open-xchange.com/) | | Knowledge management | XWiki | [16.4.4](https://www.xwiki.org/xwiki/bin/view/ReleaseNotes/Data/XWiki/16.4.4/) | [For the most recent release](https://www.xwiki.org/xwiki/bin/view/Documentation) | | Portal & IAM | Nubus | [1.0](https://www.univention.de/produkte/nubus/) | [Univention's documentation website](https://docs.software-univention.de/n/en/nubus.html) | diff --git a/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl b/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl index 84432f00..1c1ca264 100644 --- a/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl +++ b/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl @@ -19,6 +19,8 @@ cleanup: configuration: administrator: + # The admin user is (currently) required to bootstrap the OpenProject <> Nextcloud integration. + enabled: true username: value: "nextcloud" password: @@ -97,6 +99,7 @@ configuration: defaultExternalExpireEnabled: {{ .Values.functional.filestore.sharing.external.expiry.activeByDefault }} defaultExternalExpireEnforced: {{ .Values.functional.filestore.sharing.external.expiry.enforced }} defaultExternalExpireDays: {{ .Values.functional.filestore.sharing.external.expiry.defaultDays | quote }} + sendPasswordMail: {{ .Values.functional.filestore.sharing.external.sendPasswordMail | quote }} smtp: auth: enabled: false @@ -139,6 +142,7 @@ podSecurityContext: debug: loglevel: {{ if .Values.debug.enabled }}"0"{{ else }}"2"{{ end }} + bootstrap: {{ .Values.debug.enabled }} {{- if .Values.certificate.selfSigned }} extraEnvVars: diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml index 1a840ada..71c27404 100644 --- a/helmfile/environments/default/charts.yaml +++ b/helmfile/environments/default/charts.yaml @@ -242,7 +242,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud" name: "opendesk-nextcloud" - version: "3.6.0" + version: "3.6.2" verify: true nextcloudManagement: # providerCategory: "Platform" @@ -252,7 +252,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud" name: "opendesk-nextcloud-management" - version: "3.6.0" + version: "3.6.2" verify: true nginx: # providerCategory: "Community" diff --git a/helmfile/environments/default/customization.yaml b/helmfile/environments/default/customization.yaml index defe3c69..9b4defa9 100644 --- a/helmfile/environments/default/customization.yaml +++ b/helmfile/environments/default/customization.yaml @@ -2,10 +2,18 @@ # SPDX-License-Identifier: Apache-2.0 --- # This variable allows customization of helmfile releases by loading custom values file. +# +# **Warning**: Customizations are a very powerful tool to apply individual changes to your +# openDesk installation. As there are no limits set for what you use it, openDesk cannot +# support the configurations you are about to create using the customization-option. If you +# have the demand for a specific configuration, try to get it into the openDesk standard +# by creating a ticket at https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/issues +# # Example: # customization: # release: -# collaboraOnline: /path/to/additional/file.yaml +# collaboraOnline: +# myCustomConfig: "/path/to/additional/file.yaml" customization: release: # collabora diff --git a/helmfile/environments/default/functional.yaml b/helmfile/environments/default/functional.yaml index b6deed56..35b30138 100644 --- a/helmfile/environments/default/functional.yaml +++ b/helmfile/environments/default/functional.yaml @@ -45,6 +45,8 @@ functional: enabled: false # Enforces passwords to be used on external shares. enforcePasswords: false + # Let Nextcloud send the password set for the share by mail to the recipient of the share. + sendPasswordMail: true # Expiry settings for the external shares. expiry: # If true the check box for the expiry date is enabled by default. diff --git a/helmfile/environments/default/images.yaml b/helmfile/environments/default/images.yaml index 33108027..2c09395c 100644 --- a/helmfile/environments/default/images.yaml +++ b/helmfile/environments/default/images.yaml @@ -235,7 +235,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.3.2@sha256:6137eae6cf48d53e8072e57dbdde6ed555878d12a57c1b75c508ab93b3b227e3" + tag: "2.3.3@sha256:449ea2b0ed5031b8c08f00471f788ac248eb0cd33a60bbc6341098a4faf1fb78" nextcloudExporter: # providerCategory: "Platform" # providerResponsible: "openDesk"