diff --git a/README.md b/README.md index 7337e215..062b9bc2 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ openDesk currently features the following functional main components: | Function | Functional Component | Component
Version | Upstream Documentation | |----------------------|-----------------------------|-------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------| | Chat & collaboration | Element ft. Nordeck widgets | [1.11.89](https://github.com/element-hq/element-desktop/releases/tag/v1.11.89) | [For the most recent release](https://element.io/user-guide) | -| Collaborative notes | Notes (aka Docs) | [2.4.0](https://github.com/suitenumerique/docs/releases/tag/v2.4.0) | Online documentation/welcome document available in installed application | +| Collaborative notes | Notes (aka Docs) | [3.2.1](https://github.com/suitenumerique/docs/releases/tag/v3.2.1) | Online documentation/welcome document available in installed application | | Diagram editor | CryptPad ft. diagrams.net | [2024.9.0](https://github.com/cryptpad/cryptpad/releases/tag/2024.9.0) | [For the most recent release](https://docs.cryptpad.org/en/) | | File management | Nextcloud | [30.0.10](https://nextcloud.com/de/changelog/#30-0-10) | [Nextcloud 30](https://docs.nextcloud.com/) | | Groupware | OX App Suite | [8.37](https://documentation.open-xchange.com/appsuite/releases/8.37/) | Online documentation available from within the installed application; [Additional resources](https://documentation.open-xchange.com/) | diff --git a/helmfile/apps/notes/values.yaml.gotmpl b/helmfile/apps/notes/values.yaml.gotmpl index 0ca48af6..a3efe820 100644 --- a/helmfile/apps/notes/values.yaml.gotmpl +++ b/helmfile/apps/notes/values.yaml.gotmpl @@ -27,12 +27,12 @@ ingressCollaborationWS: enabled: "{{ .Values.ingress.tls.enabled }}" secretName: {{ .Values.ingress.tls.secretName | quote }} annotations: - nginx.ingress.kubernetes.io/auth-response-headers: "Authorization, X-Can-Edit, X-User-Id" - nginx.ingress.kubernetes.io/auth-url: https://{{ .Values.global.hosts.notes }}.{{ .Values.global.domain }}/api/v1.0/documents/collaboration-auth/ nginx.ingress.kubernetes.io/enable-websocket: "true" nginx.ingress.kubernetes.io/proxy-read-timeout: "86400" nginx.ingress.kubernetes.io/proxy-send-timeout: "86400" nginx.ingress.kubernetes.io/upstream-hash-by: $arg_room + nginx.ingress.kubernetes.io/auth-response-headers: null + nginx.ingress.kubernetes.io/auth-url: null {{- with .Values.annotations.notes.ingressCollaborationWS }} {{ . | toYaml | nindent 4 }} {{- end }} @@ -91,7 +91,6 @@ frontend: envVars: PORT: 8080 NEXT_PUBLIC_API_ORIGIN: {{ printf "https://%s.%s" .Values.global.hosts.notes .Values.global.domain | quote }} - NEXT_PUBLIC_Y_PROVIDER_URL: {{ printf "wss://%s.%s/ws" .Values.global.hosts.notes .Values.global.domain | quote }} NEXT_PUBLIC_MEDIA_URL: {{ printf "https://%s" (.Values.objectstores.notes.endpoint | default (printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain)) | quote }} runtimeEnvs: ICS_BASE_URL: {{ printf "https://%s.%s" .Values.global.hosts.intercomService .Values.global.domain | quote }} @@ -144,6 +143,7 @@ yProvider: seLinuxOptions: {{ .Values.seLinuxOptions.notesBackend | toYaml | nindent 6 }} envVars: + COLLABORATION_BACKEND_BASE_URL: {{ printf "https://%s.%s" .Values.global.hosts.notes .Values.global.domain | quote }} COLLABORATION_LOGGING: {{ if .Values.debug.enabled }}"true"{{ else }}"false"{{ end }} COLLABORATION_SERVER_ORIGIN: {{ printf "https://%s.%s" .Values.global.hosts.notes .Values.global.domain | quote }} COLLABORATION_SERVER_SECRET: {{ .Values.secrets.notes.collaborationSecret | quote }} @@ -214,8 +214,8 @@ backend: OIDC_OP_LOGOUT_ENDPOINT: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}/protocol/openid-connect/logout" OIDC_RP_SIGN_ALGO: RS256 OIDC_RP_SCOPES: "openid opendesk-notes-scope" - USER_OIDC_FIELD_TO_SHORTNAME: "given_name" - USER_OIDC_FIELDS_TO_FULLNAME: "given_name,family_name" + OIDC_USERINFO_SHORTNAME_FIELD: "given_name" + OIDC_USERINFO_FULLNAME_FIELDS: "given_name,family_name" USER_OIDC_ESSENTIAL_CLAIMS: "email" OIDC_REDIRECT_ALLOWED_HOSTS: {{ printf "https://%s.%s/*" .Values.global.hosts.notes .Values.global.domain | quote }} OIDC_AUTH_REQUEST_EXTRA_PARAMS: "{}" @@ -232,6 +232,8 @@ backend: COLLABORATION_SERVER_ORIGIN: {{ printf "https://%s.%s" .Values.global.hosts.notes .Values.global.domain | quote }} COLLABORATION_SERVER_SECRET: {{ .Values.secrets.notes.collaborationSecret | quote }} COLLABORATION_WS_URL: {{ printf "wss://%s.%s/collaboration/ws/" .Values.global.hosts.notes .Values.global.domain | quote }} + FRONTEND_HOMEPAGE_FEATURE_ENABLED: False + FRONTEND_FOOTER_FEATURE_ENABLED: False migrate: command: - "/bin/sh" diff --git a/helmfile/environments/default/images.yaml.gotmpl b/helmfile/environments/default/images.yaml.gotmpl index ebfc7367..ef832db4 100644 --- a/helmfile/environments/default/images.yaml.gotmpl +++ b/helmfile/environments/default/images.yaml.gotmpl @@ -344,7 +344,7 @@ images: # upstreamRepository: "lasuite/impress-backend" registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/images/opendesk-notes" - tag: "1.7.0-docs-v2.4.0-backend@sha256:837e09dfcb4014de97b5254956dda899e586170276d1d0b0f94cca0685f3d2ef" + tag: "1.9.0-docs-v3.2.1-backend@sha256:17c16e4e00b15e4637d01553d56e7eecb7a477bec48677d1e7fb07b04c48d2b8" notesFrontend: # providerCategory: "Supplier" # providerResponsible: "DINUM" @@ -352,7 +352,7 @@ images: # upstreamRepository: "lasuite/impress-frontend" registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/images/opendesk-notes" - tag: "1.7.0-docs-v2.4.0-frontend@sha256:98fb87ad877eb5658c6bef1c09adf4e03f816dce61867bc099838aca15890887" + tag: "1.9.0-docs-v3.2.1-frontend@sha256:328d5a8bf41875eb5945229adfc4a52eb2fef109e25d980910ee77edd4bc1887" notesYProvider: # providerCategory: "Supplier" # providerResponsible: "DINUM" @@ -360,7 +360,7 @@ images: # upstreamRepository: "lasuite/impress-y-provider" registry: "registry-1.docker.io" repository: "lasuite/impress-y-provider" - tag: "v2.4.0@sha256:329d47f5cda80941a7f0812969c3194ba68da3e7e1ef38e3d08c266fc97555c1" + tag: "v3.2.1@sha256:9dd7068336c02fe71806bc3576e7dc8636d7ccb139667c6303f0753e18d3ab7e" nubusDataLoader: # providerCategory: "Supplier" # providerResponsible: "Univention"