From 899a8c5af9052634b98d9876dfbaea517d89ad49 Mon Sep 17 00:00:00 2001 From: Viktor Pracht Date: Mon, 6 Nov 2023 15:38:35 +0000 Subject: [PATCH] fix(open-xchange): Add Document- and ImageConverter, improve LDAP address book filters --- helmfile/apps/open-xchange/helmfile.yaml | 2 +- ...openxchange-enterprise-contact-picker.yaml | 52 ++++++++++++++++++- .../open-xchange/values-openxchange.gotmpl | 18 +++++++ .../apps/open-xchange/values-openxchange.yaml | 47 ++++++++++++++++- helmfile/environments/default/database.yaml | 2 +- helmfile/environments/default/images.yaml | 42 +++++++++------ helmfile/environments/default/resources.yaml | 7 +++ 7 files changed, 147 insertions(+), 23 deletions(-) diff --git a/helmfile/apps/open-xchange/helmfile.yaml b/helmfile/apps/open-xchange/helmfile.yaml index 5626d19e..9155852b 100644 --- a/helmfile/apps/open-xchange/helmfile.yaml +++ b/helmfile/apps/open-xchange/helmfile.yaml @@ -44,7 +44,7 @@ releases: - name: "open-xchange" chart: "openxchange-repo/appsuite-public-sector/charts/appsuite-public-sector" - version: "2.0.4" + version: "2.1.1" values: - "values-openxchange.yaml" - "values-openxchange.gotmpl" diff --git a/helmfile/apps/open-xchange/values-openxchange-enterprise-contact-picker.yaml b/helmfile/apps/open-xchange/values-openxchange-enterprise-contact-picker.yaml index 04a6ce07..3de694dc 100644 --- a/helmfile/apps/open-xchange/values-openxchange-enterprise-contact-picker.yaml +++ b/helmfile/apps/open-xchange/values-openxchange-enterprise-contact-picker.yaml @@ -6,7 +6,7 @@ appsuite: properties: # Enterprise contact picker - com.openexchange.contacts.ldap.accounts: "opendesk" + com.openexchange.contacts.ldap.accounts: "opendesk,other,functional" com.openexchange.admin.bypassAccessCombinationChecks: "true" ENABLE_INTERNAL_USER_EDIT: "false" @@ -153,7 +153,7 @@ appsuite: # allows to sort the attributes lexicographically, either "ascending" or "descending". dynamicAttributes: attributeName: "o" - contactFilterTemplate: "(&(univentionObjectType=users/user)(o=[value]))" + contactFilterTemplate: "(&(univentionObjectType=users/user)(isOxUser=OK)(o=[value]))" contactSearchScope: "sub" # refreshInterval: 1h refreshInterval: "5m" @@ -174,6 +174,48 @@ appsuite: - "Management" - "Human Resources" + other: + name: "Other contacts" + ldapClientId: "contactsLdapClient" + mappings: "ucs" + folders: + mode: "static" + usedForSync: + protected: true + defaultValue: false + usedInPicker: + protected: false + defaultValue: true + shownInTree: + protected: false + defaultValue: true + static: + commonContactFilter: "(&(univentionObjectType=users/user)(isOxUser=OK)(!(o=*)))" + folders: + - name: "Ohne Organisation" + contactFilter: "(&(univentionObjectType=users/user)(isOxUser=OK)(!(o=*)))" + + functional: + name: "Functional mailboxes" + ldapClientId: "contactsLdapClient" + mappings: "functional" + folders: + mode: "static" + usedForSync: + protected: true + defaultValue: false + usedInPicker: + protected: false + defaultValue: true + shownInTree: + protected: false + defaultValue: true + static: + commonContactFilter: "(univentionObjectType=oxmail/functional_account)" + folders: + - name: "Funktionale Postfächer" + contactFilter: "(univentionObjectType=oxmail/functional_account)" + contacts-provider-ldap-mappings.yml: # Example definitions of contact property <-> LDAP attribute mappings. # @@ -347,3 +389,9 @@ appsuite: # image_last_modified : # Will be set automatically to "image/jpeg" if not defined. # image1_content_type : + + functional: + objectid: "mailPrimaryAddress" + displayname: "oxPersonal,cn,mailPrimaryAddress" + file_as: "oxPersonal,cn,mailPrimaryAddress" + email1: "mailPrimaryAddress" diff --git a/helmfile/apps/open-xchange/values-openxchange.gotmpl b/helmfile/apps/open-xchange/values-openxchange.gotmpl index 98c8ca57..ad93eb2a 100644 --- a/helmfile/apps/open-xchange/values-openxchange.gotmpl +++ b/helmfile/apps/open-xchange/values-openxchange.gotmpl @@ -103,6 +103,9 @@ appsuite: oxguardpass: | {{ .Values.secrets.oxAppsuite.oxguardMC }} {{ .Values.secrets.oxAppsuite.oxguardRC }} + redis: + auth: + password: {{ .Values.secrets.redis.password | quote }} image: repository: {{ .Values.images.openxchangeCoreMW.repository }} tag: {{ .Values.images.openxchangeCoreMW.tag }} @@ -139,6 +142,16 @@ appsuite: repository: {{ .Values.images.openxchangeCoreUIMiddleware.repository }} tag: {{ .Values.images.openxchangeCoreUIMiddleware.tag }} pullPolicy: "{{ .Values.global.imagePullPolicy }}" + redis: + auth: + password: {{ .Values.secrets.redis.password | quote }} + + core-documentconverter: + image: + repository: {{ .Values.images.openxchangeDocumentConverter.repository }} + tag: {{ .Values.images.openxchangeDocumentConverter.tag }} + resources: + {{- .Values.resources.oxDocumentConverter | toYaml | nindent 6 }} core-guidedtours: imagePullSecrets: @@ -150,6 +163,11 @@ appsuite: tag: {{ .Values.images.openxchangeCoreGuidedtours.tag }} pullPolicy: "{{ .Values.global.imagePullPolicy }}" + core-imageconverter: + image: + repository: {{ .Values.images.openxchangeImageConverter.repository }} + tag: {{ .Values.images.openxchangeImageConverter.tag }} + guard-ui: imagePullSecrets: {{- range .Values.global.imagePullSecrets }} diff --git a/helmfile/apps/open-xchange/values-openxchange.yaml b/helmfile/apps/open-xchange/values-openxchange.yaml index 42a5f18b..a83802d3 100644 --- a/helmfile/apps/open-xchange/values-openxchange.yaml +++ b/helmfile/apps/open-xchange/values-openxchange.yaml @@ -6,6 +6,9 @@ appsuite: ingressGateway: name: "opendesk-gateway-istio-gateway" + switchboard: + enabled: false + core-mw: enabled: true masterAdmin: "admin" @@ -63,6 +66,8 @@ appsuite: com.openexchange.mail.filter.credentialSource: "mail" com.openexchange.mail.filter.server: "dovecot" com.openexchange.mail.filter.preferredSaslMech: "XOAUTH2" + # Dovecot + com.openexchange.imap.attachmentMarker.enabled: "true" # Capabilities # Old capability can be used to toggle all integrations with a single switch com.openexchange.capability.public-sector: "true" @@ -78,6 +83,7 @@ appsuite: com.openexchange.capability.smime: "true" com.openexchange.capability.share_links: "false" com.openexchange.capability.invite_guests: "false" + com.openexchange.capability.document_preview: "true" # Secondary Accounts com.openexchange.mail.secondary.authType: "XOAUTH2" com.openexchange.mail.transport.secondary.authType: "xoauth2" @@ -89,6 +95,8 @@ appsuite: com.openexchange.gdpr.dataexport.enabled: "false" com.openexchange.gdpr.dataexport.active: "false" # Guard + com.openexchange.guard.storage.file.fileStorageType: "file" + com.openexchange.guard.storage.file.uploadDirectory: "/opt/open-xchange/guard-files/" com.openexchange.guard.guestSMTPServer: "postfix" # S/MIME # Usage (in browser console after login): @@ -139,10 +147,31 @@ appsuite: oidcLogin: true oidcPath: "/oidc" + redis: + enabled: true + mode: "standalone" + hosts: + - "redis-master" + + hooks: + beforeAppsuiteStart: + create-guard-dir.sh: | + mkdir -p /opt/open-xchange/guard-files + chown open-xchange:open-xchange /opt/open-xchange/guard-files + core-ui: enabled: true + core-ui-middleware: enabled: true + overrides: {} + redis: + mode: "standalone" + hosts: + - "redis-master:6379" + auth: + enabled: true + core-guidedtours: enabled: true guard-ui: @@ -151,12 +180,26 @@ appsuite: enabled: false core-user-guide: enabled: true + core-imageconverter: - enabled: false + enabled: true + objectCache: + s3ObjectStores: + - id: -1 + endpoint: "." + accessKey: "." + secretKey: "." + core-spellcheck: enabled: false + core-documentconverter: - enabled: false + enabled: true + documentConverter: + cache: + remoteCache: + enabled: false + core-documents-collaboration: enabled: false office-web: diff --git a/helmfile/environments/default/database.yaml b/helmfile/environments/default/database.yaml index f79075df..0c3bc0f8 100644 --- a/helmfile/environments/default/database.yaml +++ b/helmfile/environments/default/database.yaml @@ -27,7 +27,7 @@ databases: password: "" oxAppsuite: host: "mariadb" - name: "CONFIGDB" + name: "configdb" username: "root" password: "" synapse: diff --git a/helmfile/environments/default/images.yaml b/helmfile/environments/default/images.yaml index 61eb0fb8..020761ba 100644 --- a/helmfile/environments/default/images.yaml +++ b/helmfile/environments/default/images.yaml @@ -126,39 +126,47 @@ images: # @supplier: "Open-Xchange" openxchangeCoreGuidedtours: repository: "appsuite-public-sector/core-guidedtours" - tag: "8.5.1@sha256:469457562a378cca50460e08d9437a954fc6f19622f18128fa74979f7905ecd9" + tag: "8.6.0@sha256:6c20780f8c609636f2182c41709e2ee26586b4a23679fd13b15875a5f443445b" # @supplier: "Open-Xchange" openxchangeCoreMW: repository: "appsuite-public-sector/middleware-public-sector" - tag: "8.16.60@sha256:269c5b72f380c49ba1888c4300c409745d2ce757ca0b269afe1e8ac9bb26f028" + tag: "8.19.33@sha256:369c44369d727e4172f10c25137dbb00d936d20dd844cdca3a34f7f31273ea05" # @supplier: "Open-Xchange" openxchangeCoreUI: repository: "appsuite-public-sector/core-ui" - tag: "8.16.5@sha256:4f4dd4e36fb8a1b493c195e38e2f13b87c9582bfcdc3d23b646698fce2ffef8c" + tag: "8.19.0@sha256:7fdd73f78fd7094f2968f6fcaaae175e60824f9ef68f9e7e70418de6a2b623e9" # @supplier: "Open-Xchange" openxchangeCoreUIMiddleware: repository: "appsuite-public-sector/core-ui-middleware" - tag: "1.8.4@sha256:c707fbd5496c894f201dab8f4e78aad98f1ad80c8058778f04dfa5e6e201ed64" + tag: "2.0.0@sha256:8082edf30498a3ac1715f2d9b3e406f240ea586e2616b97f40c207ef55dff11f" # @supplier: "Open-Xchange" openxchangeCoreUserGuide: repository: "appsuite-public-sector/core-user-guide" - tag: "8.16.727397@sha256:5d8dbf9a91456dea59a235b495dcd002b971e2b23ef6c3a2ea5fd2071664e2a4" + tag: "8.19.771856@sha256:e00ed8f94c3c42cd288dd03f7fb18d228eb516b5e5ebd318825289b1c4ed17ab" # @supplier: "Open-Xchange" - openxchangeGuardUI: - repository: "appsuite-public-sector/guard-ui" - tag: "4.0.6@sha256:7bb8fdf944228dd78a5c33bbd8d0019d5a9e4ce1c35bda674166f2febc5d9a02" - # @supplier: "Open-Xchange" - openxchangeNextcloudIntegrationUI: - repository: "appsuite-public-sector/nextcloud-integration-ui" - tag: "1.0.5@sha256:cad4ecba431f84b8627d2e541cfea773d5ef54b65d847fa8f7e3fd0d63156497" - # @supplier: "Open-Xchange" - openxchangePublicSectorUI: - repository: "appsuite-public-sector/public-sector-ui" - tag: "2.0.1@sha256:8df90f6dfb59008567d8ded0dbd17b8f92f409c78ba2cf4ab2a39e1b23e34d3b" + openxchangeDocumentConverter: + repository: "appsuite-public-sector/documentconverter" + tag: "8.19.32@sha256:82354e858b6aeeae7f0ebaf66ad106f8e9ae46e605e97bb1d2d14e6ce1c3d708" # @supplier: "Open-Xchange" openxchangeGotenberg: repository: "appsuite-public-sector/3rdparty/gotenberg" - tag: "7.8.2@sha256:34af7b6d21c02b8183785177f5f3f1731633d72ec69e1f2ecdb8b43747887f62" + tag: "7.9.2@sha256:c97c1adb971d149222062ec46c5d749d710b38ad153c5c6ed954023e2401c9d0" + # @supplier: "Open-Xchange" + openxchangeGuardUI: + repository: "appsuite-public-sector/guard-ui" + tag: "4.0.7@sha256:8c9fa5d6aed055c0e84042ab28b3f0e9add94390362266ad440da4f90b8c93a8" + # @supplier: "Open-Xchange" + openxchangeImageConverter: + repository: "appsuite-public-sector/imageconverter" + tag: "8.19.33@sha256:9543c1409a129567bd6e4a657a353819842a4b1e1807ab86a1ea2e7f73f8c18e" + # @supplier: "Open-Xchange" + openxchangeNextcloudIntegrationUI: + repository: "appsuite-public-sector/nextcloud-integration-ui" + tag: "1.1.0@sha256:82cecb5adac63806ab41546e6b49090a93a5f4645750bb3967d87585b60df2e1" + # @supplier: "Open-Xchange" + openxchangePublicSectorUI: + repository: "appsuite-public-sector/public-sector-ui" + tag: "2.1.0@sha256:ed56730add8afdb08bef8b43a114aba406fd86d83c7fd7af93dc16bb002fa233" # @supplier: "Open-Xchange" oxConnector: repository: "souvap/tooling/images/ox-connector/ox-connector-standalone" diff --git a/helmfile/environments/default/resources.yaml b/helmfile/environments/default/resources.yaml index 5342b6bb..65cd34cc 100644 --- a/helmfile/environments/default/resources.yaml +++ b/helmfile/environments/default/resources.yaml @@ -191,6 +191,13 @@ resources: requests: cpu: 0.1 memory: "250Mi" + oxDocumentConverter: + limits: + cpu: 2 + memory: "2Gi" + requests: + cpu: 0.25 + memory: "1Gi" postfix: limits: cpu: 0.5