mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-19 14:13:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

users: revive USERS_LDAP_USER_SCHEMA_ID variable

Browse Source 
The config variable was accidently removed when cleaning up deprecated variables
for the 4.0.0 release

Fixes: #7312
(cherry picked from commit 7b9200ff5d)
This commit is contained in:
Ralf Haferkamp
2023-09-19 16:32:40 +02:00
committed by Ralf Haferkamp
parent 3f41dd7601
commit 6bf4dc5e0e
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
changelog/unreleased/fix-users-ldap-schema-user-id.md Normal file
View File

@@ -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

2
services/users/pkg/config/config.go
View File

@@ -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."`