diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-12-07 12:28:59 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-12-07 12:28:59 +0100 |
| commit | abcba5c19885f789557fe1fa62dba7f176d9afe6 (patch) | |
| tree | 67628941bd27b7887f92ae758db7d81f34823e62 /.env.production.sample | |
| parent | 7d59e25fbd7a0209c11cbe6aac4400bbca4de82b (diff) | |
| parent | 6d7daf6154b1edbfe9a0c0b297baab8cd45658f3 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc.
Diffstat (limited to '.env.production.sample')
| -rw-r--r-- | .env.production.sample | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.env.production.sample b/.env.production.sample index f5f2343b7..8121aafeb 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -203,7 +203,8 @@ STREAMING_CLUSTER_NUM=1 # LDAP_BIND_DN= # LDAP_PASSWORD= # LDAP_UID=cn -# LDAP_SEARCH_FILTER=%{uid}=%{email} +# LDAP_MAIL=mail +# LDAP_SEARCH_FILTER=(|(%{uid}=%{email})(%{mail}=%{email})) # LDAP_UID_CONVERSION_ENABLED=true # LDAP_UID_CONVERSION_SEARCH=., - # LDAP_UID_CONVERSION_REPLACE=_ |