diff --git a/README.md b/README.md index e6bdd021..1a4a3d6c 100644 --- a/README.md +++ b/README.md @@ -35,6 +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 | | 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.6](https://nextcloud.com/de/changelog/#30-0-6) | [Nextcloud 30](https://docs.nextcloud.com/) | | Groupware | OX App Suite | [8.35](https://documentation.open-xchange.com/appsuite/releases/8.35/) | 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 a3242dfe..448437e1 100644 --- a/helmfile/apps/notes/values.yaml.gotmpl +++ b/helmfile/apps/notes/values.yaml.gotmpl @@ -4,7 +4,7 @@ SPDX-License-Identifier: Apache-2.0 */}} --- image: - repository: {{ printf "%s/%s" (coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.notesBackend.registry) (.Values.images.notesBackend.repository) | quote }} + repository: {{ printf "%s/%s" (coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.notesBackend.registry) (.Values.images.notesBackend.repository) | quote }} pullPolicy: {{ .Values.global.imagePullPolicy | quote }} tag: {{ .Values.images.notesBackend.tag }} credentials: @@ -48,7 +48,7 @@ ingressMedia: host: "{{ .Values.global.hosts.notes }}.{{ .Values.global.domain }}" annotations: nginx.ingress.kubernetes.io/auth-response-headers: "Authorization, X-Amz-Date, X-Amz-Content-SHA256" - nginx.ingress.kubernetes.io/auth-url: "https://{{ .Values.global.hosts.notes }}.{{ .Values.global.domain }}/api/v1.0/documents/retrieve-auth/" + nginx.ingress.kubernetes.io/auth-url: "https://{{ .Values.global.hosts.notes }}.{{ .Values.global.domain }}/api/v1.0/documents/media-auth/" nginx.ingress.kubernetes.io/upstream-vhost: {{ .Values.objectstores.notes.endpoint | default (printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain) | quote }} nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" nginx.ingress.kubernetes.io/use-regex: "true" @@ -143,6 +143,10 @@ djangoSuperUserPass: {{ .Values.secrets.notes.superuser }} djangoSecretKey: {{ .Values.secrets.notes.djangoSecretKey }} backend: + image: + repository: {{ printf "%s/%s" (coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.notesBackend.registry) (.Values.images.notesBackend.repository) | quote }} + pullPolicy: {{ .Values.global.imagePullPolicy | quote }} + tag: {{ .Values.images.notesBackend.tag }} replicas: {{ .Values.replicas.notesBackend }} envVars: DB_HOST: {{ .Values.databases.notes.host | quote }} @@ -160,11 +164,16 @@ backend: AWS_S3_SECRET_ACCESS_KEY: {{ .Values.objectstores.notes.secretKey | default .Values.secrets.minio.notesUser | quote }} AWS_STORAGE_BUCKET_NAME: {{ .Values.objectstores.notes.bucket }} DJANGO_CSRF_TRUSTED_ORIGINS: {{ printf "https://%s.%s" .Values.global.hosts.notes .Values.global.domain | quote }} + DJANGO_SITE_DOMAIN: {{ printf "%s.%s" .Values.global.hosts.notes .Values.global.domain | quote }} + DJANGO_SITE_NAME: {{ printf "%s.%s" .Values.global.hosts.notes .Values.global.domain | quote }} DJANGO_CONFIGURATION: Production DJANGO_ALLOWED_HOSTS: "*" DJANGO_SECRET_KEY: {{ .Values.secrets.notes.djangoSecretKey }} DJANGO_SETTINGS_MODULE: impress.settings DJANGO_SUPERUSER_PASSWORD: {{ .Values.secrets.notes.superuser }} + DJANGO_EMAIL_BRAND_NAME: "openDesk" + DJANGO_EMAIL_LOGO_IMG: {{ printf "https://%s.%s/univention/portal/icons/entries/swp.notes.svg" .Values.global.hosts.nubus .Values.global.domain | quote }} + DJANGO_EMAIL_FROM: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}" DJANGO_EMAIL_HOST: "postfix" DJANGO_EMAIL_PORT: 25 DJANGO_EMAIL_USE_SSL: False @@ -181,7 +190,8 @@ backend: 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" + USER_OIDC_FIELDS_TO_FULLNAME: "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: "{}" OIDC_RENEW_ID_TOKEN: "False" @@ -202,8 +212,7 @@ backend: - "/bin/sh" - "-c" - | - python manage.py migrate --no-input && - python manage.py create_demo --force + python manage.py migrate --no-input restartPolicy: Never createsuperuser: diff --git a/helmfile/environments/default/images.yaml.gotmpl b/helmfile/environments/default/images.yaml.gotmpl index 2dd85cec..781aca4a 100644 --- a/helmfile/environments/default/images.yaml.gotmpl +++ b/helmfile/environments/default/images.yaml.gotmpl @@ -341,9 +341,9 @@ images: # providerResponsible: "DINUM" # upstreamRegistry: "https://registry-1.docker.io" # upstreamRepository: "lasuite/impress-backend" - registry: "registry-1.docker.io" - repository: "lasuite/impress-backend" - tag: "v1.10.0-docs-production@sha256:62f31bf18335fec031f9ea3af828b84a8bb811793b63bc1c484e4ce14d437198" + registry: "registry.opencode.de" + repository: "bmi/opendesk/components/platform-development/images/opendesk-notes" + tag: "1.7.0-docs-v2.4.0-backend@sha256:837e09dfcb4014de97b5254956dda899e586170276d1d0b0f94cca0685f3d2ef" notesFrontend: # providerCategory: "Supplier" # providerResponsible: "DINUM" @@ -351,7 +351,7 @@ images: # upstreamRepository: "lasuite/impress-frontend" registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/images/opendesk-notes" - tag: "1.5.1@sha256:dad7dd60a5eb39b71b4911558cf7eac9ed6dc050593a046f5da0eaa75c65d344" + tag: "1.7.0-docs-v2.4.0-frontend@sha256:98fb87ad877eb5658c6bef1c09adf4e03f816dce61867bc099838aca15890887" notesYProvider: # providerCategory: "Supplier" # providerResponsible: "DINUM" @@ -359,7 +359,7 @@ images: # upstreamRepository: "lasuite/impress-y-provider" registry: "registry-1.docker.io" repository: "lasuite/impress-y-provider" - tag: "v1.10.0-docs-production@sha256:9fcdb1fe7b20f0026b94765d64d83a2fe76cbe6e59c43d098fa21a7ea0c74803" + tag: "v2.4.0@sha256:329d47f5cda80941a7f0812969c3194ba68da3e7e1ef38e3d08c266fc97555c1" nubusDataLoader: # providerCategory: "Supplier" # providerResponsible: "Univention" @@ -529,7 +529,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.12.7@sha256:6981bcae5f942b5ddd4a13f3f55331860d333f28d1ae6beba893f0681c1c447c" + tag: "1.12.8@sha256:9c5e06ed459c0b5f35e511c476b982b86466760bd3fe1617aa908fdcf9e389df" nubusOpendeskExtensionA2gMapper: # providerCategory: "Platform" # providerResponsible: "openDesk"