From 6b88f731eb2b6c8ceebc9a7a0c96e63d13743b24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20Ro=C3=9Fner?= Date: Tue, 3 Sep 2024 09:38:14 +0200 Subject: [PATCH] fix(helmfile): Add new settings to `functional.yaml` for fileshare expiry dates. --- docs/migrations.md | 31 ++++++++++++++++--- .../values-nextcloud-mgmt.yaml.gotmpl | 16 +++++++--- helmfile/environments/default/charts.yaml | 4 +-- helmfile/environments/default/functional.yaml | 30 +++++++++++++++--- helmfile/environments/default/images.yaml | 4 +-- 5 files changed, 67 insertions(+), 18 deletions(-) diff --git a/docs/migrations.md b/docs/migrations.md index d089a6eb..fe452d17 100644 --- a/docs/migrations.md +++ b/docs/migrations.md @@ -7,6 +7,29 @@ SPDX-License-Identifier: Apache-2.0 * [Disclaimer](#disclaimer) +* [Releases upgrades](#releases-upgrades) + * [From v0.9.0](#from-v090) + * [Changed openDesk defaults](#changed-opendesk-defaults) + * [MatrixID localpart update](#matrixid-localpart-update) + * [File-share configurability](#file-share-configurability) + * [Updated default subdomains in `global.hosts`](#updated-default-subdomains-in-globalhosts) + * [Updated `global.imagePullSecrets`](#updated-globalimagepullsecrets) + * [Automated migrations](#automated-migrations) + * [Local Postfix as Relay](#local-postfix-as-relay) + * [Updated IAM component Nubus](#updated-iam-component-nubus) + * [Manual cleanup](#manual-cleanup) + * [From v0.8.1](#from-v081) + * [Updated `cluster.networking.cidr`](#updated-clusternetworkingcidr) + * [Updated customizable template attributes](#updated-customizable-template-attributes) + * [`migrations` S3 bucket](#migrations-s3-bucket) +* [Related components and artefacts](#related-components-and-artefacts) + * [Development](#development) +>>>>>>> 240fb47 (fix(nextcloud): Add new settings to `functional.yaml` for expiry dates.) + * [Automated migrations](#automated-migrations) + * [Local Postfix as Relay](#local-postfix-as-relay) + * [Updated IAM component Nubus](#updated-iam-component-nubus) + * [Manual cleanup](#manual-cleanup) +* [Disclaimer](#disclaimer) * [Releases upgrades](#releases-upgrades) * [From v0.9.0](#from-v090) * [Changed openDesk defaults](#changed-opendesk-defaults) @@ -86,12 +109,12 @@ To keep the current state after the upgrade from 0.9.0, you have to provide the functional: filestore: sharing: - # Enables sharing of files with external participants (create external links, send links by mail and allow external upload in shared folders). - enableExternalSharing: true - # Enforces passwords to be used on external shares. - enforceSharingPasswords: false + external: + enabled: true ``` +Please also check the other new options available at `functional.filestore.sharing`. + #### Updated default subdomains in `global.hosts` We have streamlined the subdomain names used by openDesk to be more user-friendly and to avoid the use of specific diff --git a/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl b/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl index 9ce18947..65324bd6 100644 --- a/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl +++ b/helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl @@ -74,11 +74,17 @@ configuration: password: value: {{ .Values.secrets.centralnavigation.apiKey | quote }} sharing: - allowLinks: {{ .Values.functional.filestore.sharing.enableExternalSharing }} - allowMailNotification: {{ .Values.functional.filestore.sharing.enableExternalSharing }} - allowPublicUpload: {{ .Values.functional.filestore.sharing.enableExternalSharing }} - enforceLinksPassword: {{ .Values.functional.filestore.sharing.enforceSharingPasswords }} - enforcePasswordProtection: {{ .Values.functional.filestore.sharing.enforceSharingPasswords }} + allowLinks: {{ .Values.functional.filestore.sharing.external.enabled }} + allowMailNotification: {{ .Values.functional.filestore.sharing.external.enabled }} + allowPublicUpload: {{ .Values.functional.filestore.sharing.external.enabled }} + enforceLinksPassword: {{ .Values.functional.filestore.sharing.external.enforcePasswords }} + enforcePasswordProtection: {{ .Values.functional.filestore.sharing.external.enforcePasswords }} + defaultInternalExpireEnabled: {{ .Values.functional.filestore.sharing.internal.expiry.activeByDefault }} + defaultInternalExpireEnforced: {{ .Values.functional.filestore.sharing.internal.expiry.enforced }} + defaultInternalExpireDays: {{ .Values.functional.filestore.sharing.internal.expiry.defaultDays | quote }} + 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 }} smtp: auth: enabled: false diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml index 987192e9..f4991b2c 100644 --- a/helmfile/environments/default/charts.yaml +++ b/helmfile/environments/default/charts.yaml @@ -232,7 +232,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud" name: "opendesk-nextcloud" - version: "3.1.0" + version: "3.2.0" verify: true nextcloudManagement: # providerCategory: "Platform" @@ -242,7 +242,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud" name: "opendesk-nextcloud-management" - version: "3.1.0" + version: "3.2.0" verify: true nginx: # providerCategory: "Community" diff --git a/helmfile/environments/default/functional.yaml b/helmfile/environments/default/functional.yaml index 70aa0341..fa04e3d7 100644 --- a/helmfile/environments/default/functional.yaml +++ b/helmfile/environments/default/functional.yaml @@ -36,11 +36,31 @@ functional: default: 1 # Options related to file sharing, changing these options might require a restart of the `opendesk-nextcloud-php` Pod(s). sharing: - # Enables sharing of files with external participants (create external links, send links by mail and allow external upload in shared folders). - # If you disable this option existing external shares stop working, when re-enabling it the old shares are available again. - enableExternalSharing: false - # Enforces passwords to be used on external shares. - enforceSharingPasswords: true + # External shares + external: + # Enables sharing of files with external participants (create external links, send links by mail and allow external upload in shared folders). + # If you disable this option existing external shares stop working, when re-enabling it the old shares are available again. + enabled: false + # Enforces passwords to be used on external shares. + enforcePasswords: false + # Expiry settings for the external shares. + expiry: + # If true the check box for the expiry date is enabled by default. + activeByDefault: true + # Enforce an expiry date to be set overriding `activeByDefault` setting. + enforced: false + # Set the number of days the default expiry date is in the future (requires `activeByDefault` to be `true`) + defaultDays: 30 + # External shares + internal: + # Expiry settings for the internal shares. + expiry: + # If true the check box for the expiry date is enabled by default. + activeByDefault: false + # Enforce an expiry date to be set overriding `activeByDefault` setting. + enforced: false + # Set the number of days the default expiry date is in the future (requires `activeByDefault` to be `true`). + defaultDays: 90 # Nextcloud specific configuration nextcloud: retentionObligation: diff --git a/helmfile/environments/default/images.yaml b/helmfile/environments/default/images.yaml index 00bafab4..cf674b6f 100644 --- a/helmfile/environments/default/images.yaml +++ b/helmfile/environments/default/images.yaml @@ -253,7 +253,7 @@ images: # upstreamRepository: "bmi/opendesk/components/platform-development/images/opendesk-nextcloud-management" registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/images/opendesk-nextcloud-management" - tag: "1.5.3@sha256:19f5354a951b043327906d8670c0466e2a00317ad0dd4b99d0edf882e213d22f" + tag: "1.6.1@sha256:98c9829e60878de63dea9fbe255f50ea90aa8941b504351bf952e2eafada60f6" nextcloudPHP: # providerCategory: "Platform" # providerResponsible: "openDesk" @@ -261,7 +261,7 @@ images: # upstreamRepository: "bmi/opendesk/components/platform-development/images/opendesk-nextcloud-php" registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/images/opendesk-nextcloud-php" - tag: "1.11.3@sha256:c88af69971e2b2b1ead90db69d6af3355be5309d6c91b2b6a18fac2c6781b760" + tag: "1.12.1@sha256:9caea85701b9af7178f4cb30d3819380cf6853b7b4623c7c75c8784fe42a94ef" nubusDataLoader: # providerCategory: "Supplier" # providerResponsible: "Univention"