diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf4e83df..7082431a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,8 +127,7 @@ variables: - "yes" - "no" TESTS_PROJECT_URL: - description: "URL of the E2E-test gitlab project API with project ID." - value: "gitlab.souvap-univention.de/api/v4/projects/6" + description: "URL of the E2E-test Gitlab project API with project ID." # please use the following set of variables with normalized names: DOMAIN: "${NAMESPACE}.${CLUSTER}.${BASE_DOMAIN}" ISTIO_DOMAIN: "${NAMESPACE}.istio.${CLUSTER}.${BASE_DOMAIN}" @@ -192,7 +191,7 @@ env-cleanup: env-start: environment: name: "${NAMESPACE}" - url: "https://portal.${NAMESPACE}.${SWP_DOMAIN}" + url: "https://portal.${DOMAIN}" on_stop: "env-stop" extends: ".deploy-common" image: "${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine/k8s:1.25.6" diff --git a/helmfile/apps/open-xchange/helmfile.yaml b/helmfile/apps/open-xchange/helmfile.yaml index abfd983f..1569df91 100644 --- a/helmfile/apps/open-xchange/helmfile.yaml +++ b/helmfile/apps/open-xchange/helmfile.yaml @@ -13,7 +13,7 @@ repositories: releases: - name: "dovecot" chart: "dovecot/dovecot" - version: "1.2.0" + version: "1.3.1" values: - "values-dovecot.yaml" - "values-dovecot.gotmpl" diff --git a/helmfile/apps/open-xchange/values-openxchange.yaml b/helmfile/apps/open-xchange/values-openxchange.yaml index c4ca58e2..c3e5602c 100644 --- a/helmfile/apps/open-xchange/values-openxchange.yaml +++ b/helmfile/apps/open-xchange/values-openxchange.yaml @@ -65,6 +65,7 @@ appsuite: com.openexchange.capability.smime: "true" # Secondary Accounts com.openexchange.mail.secondary.authType: "XOAUTH2" + com.openexchange.mail.transport.secondary.authType: "xoauth2" # Nextcloud integration com.openexchange.file.storage.nextcloud.oauth.url: "http://nextcloud/" com.openexchange.file.storage.nextcloud.oauth.webdav.username.strategy: "user" diff --git a/helmfile/environments/default/images.gotmpl b/helmfile/environments/default/images.gotmpl index 06f01a4c..11936009 100644 --- a/helmfile/environments/default/images.gotmpl +++ b/helmfile/environments/default/images.gotmpl @@ -108,8 +108,8 @@ images: repository: "bitnami/redis" tag: "7.0.12-debian-11-r0" univentionCorporateServer: - repository: "souvap/tooling/images/univention-corporate-server-swp/ucs" - tag: "20230806T234258" + repository: "souvap/tooling/images/univention-corporate-server-swp/ucs@sha256" + tag: "286503f13726399284b49d4521f45fdbed81216875d78e76dcae20e0d8301f65" xwiki: repository: "xwikisas/swp/xwiki" tag: "0.8-mariadb-tomcat"