From 9aa907a90996b7b4fe4addbd4ca9f0eae6f65aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20Ro=C3=9Fner?= Date: Fri, 5 Jan 2024 16:13:34 +0100 Subject: [PATCH] fix(xwiki): Ldap group sync filter --- helmfile/apps/openproject/values.yaml | 2 +- helmfile/apps/xwiki/values.yaml.gotmpl | 6 ++---- helmfile/environments/default/charts.yaml | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/helmfile/apps/openproject/values.yaml b/helmfile/apps/openproject/values.yaml index 3ac3a297..869f58ca 100644 --- a/helmfile/apps/openproject/values.yaml +++ b/helmfile/apps/openproject/values.yaml @@ -82,7 +82,7 @@ environment: OPENPROJECT_FOG_CREDENTIALS_PATH__STYLE: "true" # Define an admin mapping from the claim # The attribute mapping cannot currently be defined in the value - OPENPROJECT_OPENID__CONNECT_KEYCLOAK_ATTRIBUTE__MAP_ADMIN: "openproject_admin" + # OPENPROJECT_OPENID__CONNECT_KEYCLOAK_ATTRIBUTE__MAP_ADMIN: "openproject_admin" seederJob: annotations: diff --git a/helmfile/apps/xwiki/values.yaml.gotmpl b/helmfile/apps/xwiki/values.yaml.gotmpl index 1011563c..ef626971 100644 --- a/helmfile/apps/xwiki/values.yaml.gotmpl +++ b/helmfile/apps/xwiki/values.yaml.gotmpl @@ -140,11 +140,9 @@ properties: "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.ldapGroupImportSearchDN": "dc=swp-ldap,dc=internal" ## LDAP filter to only synchronize some groups - # "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.ldapGroupImportSearchFilter": - # "(&(objectClass=opendeskKnowledgemanagementGroup)(opendeskKnowledgemanagementEnabled=TRUE))" "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.ldapGroupImportSearchFilter": - "(objectClass=opendeskKnowledgemanagementGroup)" - "property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.title": "{{ .Values.theme.texts.productName }} Wissen - $!tdoc.displayTitle" + "(&(objectClass=opendeskKnowledgemanagementGroup)(opendeskKnowledgemanagementEnabled=TRUE))" + "property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.title": "{{ .Values.theme.texts.productName }} Wissen - \\$!tdoc.displayTitle" replicaCount: {{ .Values.replicas.xwiki }} diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml index 9475bc58..05d57bd6 100644 --- a/helmfile/environments/default/charts.yaml +++ b/helmfile/environments/default/charts.yaml @@ -650,7 +650,7 @@ charts: repository: "bmi/opendesk/components/supplier/univention/charts-mirror" name: "stack-data-swp" verify: true - version: "0.41.4" + version: "0.41.5" # @supplier: "Univention" # @mirrorFilter: '^(\d+)\.(\d+)\.(\d+)$' # @mirrorFrom: ['0', '39', '5'] @@ -664,7 +664,7 @@ charts: repository: "bmi/opendesk/components/supplier/univention/charts-mirror" name: "stack-data-ums" verify: true - version: "0.41.4" + version: "0.41.5" # @supplier: "Univention" # @mirrorFilter: '^(\d+)\.(\d+)\.(\d+)$' # @mirrorFrom: ['0', '39', '5']