archive-gh-me/docker-gitlab
1
0
Fork 0
mirror of https://github.com/sameersbn/docker-gitlab.git synced 2026-01-18 13:58:25 +00:00
Code Issues Projects Releases Wiki Activity

fix possible values for ldap-encryption

Browse Source
This commit is contained in:
BirgerK 2017-10-15 17:03:20 +02:00 committed by Niclas Mietz
parent b027c5ec03
commit bdb4dbd18f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -952,8 +952,8 @@ Below is the complete list of available options that can be used to customize yo
| `LDAP_HOST` | LDAP Host |
| `LDAP_PORT` | LDAP Port. Defaults to `389` |
| `LDAP_UID` | LDAP UID. Defaults to `sAMAccountName` |
| `LDAP_METHOD` | LDAP method, Possible values are `ssl`, `tls` and `plain`. Defaults to `plain` |
| `LDAP_VERIFY_SSL` | LDAP verify ssl certificate for installations that are using `start_tls` or `simple_tls`. Defaults to `true` |
| `LDAP_METHOD` | LDAP method, Possible values are `simple_tls`, `start_tls` and `plain`. Defaults to `plain` |
| `LDAP_VERIFY_SSL` | LDAP verify ssl certificate for installations that are using `LDAP_METHOD: 'simple_tls'` or `LDAP_METHOD: 'start_tls'`. Defaults to `true` |
| `LDAP_BIND_DN` | No default. |
| `LDAP_PASS` | LDAP password |
| `LDAP_TIMEOUT` | Timeout, in seconds, for LDAP queries. Defaults to `10`. |

2
assets/runtime/config/gitlabhq/gitlab.yml
View File

@ -264,7 +264,7 @@ production: &base
host: '{{LDAP_HOST}}'
port: {{LDAP_PORT}}
uid: '{{LDAP_UID}}'
encryption: '{{LDAP_METHOD}}' # "tls" or "ssl" or "plain"
encryption: '{{LDAP_METHOD}}' # "start_tls" or "simple_tls" or "plain"
verify_certificates: '{{LDAP_VERIFY_SSL}}'
bind_dn: '{{LDAP_BIND_DN}}'
password: '{{LDAP_PASS}}'