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

Merge pull request #1392 from osixia/ldap-config

Browse Source 
ldap ca_file and ssl_version config params
This commit is contained in:
Niclas Mietz 2017-11-01 01:17:16 +01:00 committed by GitHub
commit bbff2f34e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -955,6 +955,8 @@ Below is the complete list of available options that can be used to customize yo
| `LDAP_UID` | LDAP UID. Defaults to `sAMAccountName` |
| `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_CA_FILE` | Specifies the path to a file containing a PEM-format CA certificate. Defaults to `` |
| `LDAP_SSL_VERSION` | Specifies the SSL version for OpenSSL to use, if the OpenSSL default is not appropriate. Example: 'TLSv1_1'. Defaults to `` |
| `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

@ -268,6 +268,8 @@ production: &base
encryption: '{{LDAP_METHOD}}' # "start_tls" or "simple_tls" or "plain"
verify_certificates: {{LDAP_VERIFY_SSL}}
ca_file: '{{LDAP_CA_FILE}}'
ssl_version: '{{LDAP_SSL_VERSION}}'
bind_dn: '{{LDAP_BIND_DN}}'
password: '{{LDAP_PASS}}'

2
assets/runtime/env-defaults
View File

@ -246,6 +246,8 @@ LDAP_PORT=${LDAP_PORT:-389}
LDAP_UID=${LDAP_UID:-sAMAccountName}
LDAP_METHOD=${LDAP_METHOD:-plain}
LDAP_VERIFY_SSL=${LDAP_VERIFY_SSL:-true}
LDAP_CA_FILE=${LDAP_CA_FILE:-}
LDAP_SSL_VERSION=${LDAP_SSL_VERSION:-}
LDAP_BIND_DN=${LDAP_BIND_DN:-}
LDAP_PASS=${LDAP_PASS:-}
LDAP_TIMEOUT=${LDAP_TIMEOUT:-10}

2
assets/runtime/functions
View File

@ -445,6 +445,8 @@ gitlab_configure_ldap() {
LDAP_UID \
LDAP_METHOD \
LDAP_VERIFY_SSL \
LDAP_CA_FILE \
LDAP_SSL_VERSION \
LDAP_BIND_DN \
LDAP_PASS \
LDAP_TIMEOUT \