From 8152646a77100ced87a1bbed3c5e8576d159ee92 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Tue, 19 Sep 2023 16:32:40 +0200 Subject: [PATCH] users: revive USERS_LDAP_USER_SCHEMA_ID variable The config variable was accidently removed when cleaning up deprecated variables for the 4.0.0 release Fixes: #7312 (cherry picked from commit 7b9200ff5db23a10788f50b620653025386c3071) --- changelog/unreleased/fix-users-ldap-schema-user-id.md | 7 +++++++ services/users/pkg/config/config.go | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 changelog/unreleased/fix-users-ldap-schema-user-id.md diff --git a/changelog/unreleased/fix-users-ldap-schema-user-id.md b/changelog/unreleased/fix-users-ldap-schema-user-id.md new file mode 100644 index 00000000000..efc2640247d --- /dev/null +++ b/changelog/unreleased/fix-users-ldap-schema-user-id.md @@ -0,0 +1,7 @@ +Bugfix: Bring back the USERS_LDAP_USER_SCHEMA_ID variable + +We reintroduced the USERS_LDAP_USER_SCHEMA_ID variable which was accidently removed from the users service +with the 4.0.0 release. + +https://github.com/owncloud/ocis/issues/7312 +https://github.com/owncloud/ocis-charts/issues/397 diff --git a/services/users/pkg/config/config.go b/services/users/pkg/config/config.go index d36f9a298b6..8acd04b14e1 100644 --- a/services/users/pkg/config/config.go +++ b/services/users/pkg/config/config.go @@ -86,7 +86,7 @@ type LDAPDriver struct { } type LDAPUserSchema struct { - ID string `yaml:"id" env:"OCIS_LDAP_USER_SCHEMA_ID" desc:"LDAP Attribute to use as the unique ID for users. This should be a stable globally unique ID like a UUID."` + ID string `yaml:"id" env:"OCIS_LDAP_USER_SCHEMA_ID;USERS_LDAP_USER_SCHEMA_ID" desc:"LDAP Attribute to use as the unique ID for users. This should be a stable globally unique ID like a UUID."` IDIsOctetString bool `yaml:"id_is_octet_string" env:"OCIS_LDAP_USER_SCHEMA_ID_IS_OCTETSTRING;LDAP_USER_SCHEMA_ID_IS_OCTETSTRING;USERS_LDAP_USER_SCHEMA_ID_IS_OCTETSTRING" desc:"Set this to true if the defined 'ID' attribute for users is of the 'OCTETSTRING' syntax. This is e.g. required when using the 'objectGUID' attribute of Active Directory for the user ID's." deprecationVersion:"4.0.2" removalVersion:"5.0.0" deprecationInfo:"LDAP_USER_SCHEMA_ID_IS_OCTETSTRING changing name for consistency" deprecationReplacement:"OCIS_LDAP_USER_SCHEMA_ID_IS_OCTETSTRING"` Mail string `yaml:"mail" env:"OCIS_LDAP_USER_SCHEMA_MAIL;USERS_LDAP_USER_SCHEMA_MAIL" desc:"LDAP Attribute to use for the email address of users."` DisplayName string `yaml:"display_name" env:"OCIS_LDAP_USER_SCHEMA_DISPLAYNAME;USERS_LDAP_USER_SCHEMA_DISPLAYNAME" desc:"LDAP Attribute to use for the displayname of users."`