sheppy/opendesk
1
0
Fork 0
mirror of https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git synced 2025-12-08 16:28:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(open-xchange): Functional mailboxes auth settings update in AppSuite and Dovecot

Browse Source
This commit is contained in:
Thorsten Rossner
2023-08-14 06:42:59 +00:00
parent 48a87fb839
commit 53948eae76
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@@ -127,8 +127,7 @@ variables:
- "yes" - "yes"
- "no" - "no"
TESTS_PROJECT_URL: TESTS_PROJECT_URL:
description: "URL of the E2E-test gitlab project API with project ID." description: "URL of the E2E-test Gitlab project API with project ID."
value: "gitlab.souvap-univention.de/api/v4/projects/6"
# please use the following set of variables with normalized names: # please use the following set of variables with normalized names:
DOMAIN: "${NAMESPACE}.${CLUSTER}.${BASE_DOMAIN}" DOMAIN: "${NAMESPACE}.${CLUSTER}.${BASE_DOMAIN}"
ISTIO_DOMAIN: "${NAMESPACE}.istio.${CLUSTER}.${BASE_DOMAIN}" ISTIO_DOMAIN: "${NAMESPACE}.istio.${CLUSTER}.${BASE_DOMAIN}"
@@ -192,7 +191,7 @@ env-cleanup:
env-start: env-start:
environment: environment:
name: "${NAMESPACE}" name: "${NAMESPACE}"
url: "https://portal.${NAMESPACE}.${SWP_DOMAIN}" url: "https://portal.${DOMAIN}"
on_stop: "env-stop" on_stop: "env-stop"
extends: ".deploy-common" extends: ".deploy-common"
image: "${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine/k8s:1.25.6" image: "${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine/k8s:1.25.6"

2
helmfile/apps/open-xchange/helmfile.yaml
View File

@@ -13,7 +13,7 @@ repositories:
releases: releases:
- name: "dovecot" - name: "dovecot"
chart: "dovecot/dovecot" chart: "dovecot/dovecot"
version: "1.2.0" version: "1.3.1"
values: values:
- "values-dovecot.yaml" - "values-dovecot.yaml"
- "values-dovecot.gotmpl" - "values-dovecot.gotmpl"

1
helmfile/apps/open-xchange/values-openxchange.yaml
View File

@@ -65,6 +65,7 @@ appsuite:
com.openexchange.capability.smime: "true" com.openexchange.capability.smime: "true"
# Secondary Accounts # Secondary Accounts
com.openexchange.mail.secondary.authType: "XOAUTH2" com.openexchange.mail.secondary.authType: "XOAUTH2"
com.openexchange.mail.transport.secondary.authType: "xoauth2"
# Nextcloud integration # Nextcloud integration
com.openexchange.file.storage.nextcloud.oauth.url: "http://nextcloud/" com.openexchange.file.storage.nextcloud.oauth.url: "http://nextcloud/"
com.openexchange.file.storage.nextcloud.oauth.webdav.username.strategy: "user" com.openexchange.file.storage.nextcloud.oauth.webdav.username.strategy: "user"

4
helmfile/environments/default/images.gotmpl
View File

@@ -108,8 +108,8 @@ images:
repository: "bitnami/redis" repository: "bitnami/redis"
tag: "7.0.12-debian-11-r0" tag: "7.0.12-debian-11-r0"
univentionCorporateServer: univentionCorporateServer:
repository: "souvap/tooling/images/univention-corporate-server-swp/ucs" repository: "souvap/tooling/images/univention-corporate-server-swp/ucs@sha256"
tag: "20230806T234258" tag: "286503f13726399284b49d4521f45fdbed81216875d78e76dcae20e0d8301f65"
xwiki: xwiki:
repository: "xwikisas/swp/xwiki" repository: "xwikisas/swp/xwiki"
tag: "0.8-mariadb-tomcat" tag: "0.8-mariadb-tomcat"