Commit e98ec566 authored by Emily Chang's avatar Emily Chang Committed by Evan Read

Specify retry for Google Secure LDAP

parent 5726de8b
...@@ -87,6 +87,7 @@ values obtained during the LDAP client configuration earlier: ...@@ -87,6 +87,7 @@ values obtained during the LDAP client configuration earlier:
password: 'd6V5H8nhMUW9AuDP25abXeLd' password: 'd6V5H8nhMUW9AuDP25abXeLd'
encryption: 'simple_tls' encryption: 'simple_tls'
verify_certificates: true verify_certificates: true
retry_empty_result_with_codes: [80]
tls_options: tls_options:
cert: | cert: |
...@@ -159,6 +160,7 @@ values obtained during the LDAP client configuration earlier: ...@@ -159,6 +160,7 @@ values obtained during the LDAP client configuration earlier:
password: 'd6V5H8nhMUW9AuDP25abXeLd' password: 'd6V5H8nhMUW9AuDP25abXeLd'
encryption: 'simple_tls' encryption: 'simple_tls'
verify_certificates: true verify_certificates: true
retry_empty_result_with_codes: [80]
tls_options: tls_options:
cert: | cert: |
......
...@@ -174,7 +174,7 @@ production: ...@@ -174,7 +174,7 @@ production:
| `base` | Base where we can search for users. | **{check-circle}** Yes | `'ou=people,dc=gitlab,dc=example'` or `'DC=mydomain,DC=com'` | | `base` | Base where we can search for users. | **{check-circle}** Yes | `'ou=people,dc=gitlab,dc=example'` or `'DC=mydomain,DC=com'` |
| `user_filter` | Filter LDAP users. Format: [RFC 4515](https://tools.ietf.org/search/rfc4515) Note: GitLab does not support `omniauth-ldap`'s custom filter syntax. | **{dotted-circle}** No | For examples, read [Examples of user filters](#examples-of-user-filters). | | `user_filter` | Filter LDAP users. Format: [RFC 4515](https://tools.ietf.org/search/rfc4515) Note: GitLab does not support `omniauth-ldap`'s custom filter syntax. | **{dotted-circle}** No | For examples, read [Examples of user filters](#examples-of-user-filters). |
| `lowercase_usernames` | If enabled, GitLab converts the name to lower case. | **{dotted-circle}** No | boolean | | `lowercase_usernames` | If enabled, GitLab converts the name to lower case. | **{dotted-circle}** No | boolean |
| `retry_empty_result_with_codes` | An array of LDAP query response code that will attempt to retrying the operation if the result/content is empty. | **{dotted-circle}** No | `[80]` | | `retry_empty_result_with_codes` | An array of LDAP query response code that will attempt to retry the operation if the result/content is empty. For Google Secure LDAP, set this value to `[80]`. | **{dotted-circle}** No | `[80]` |
#### Examples of user filters #### Examples of user filters
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment