Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-07-13 15:25:18 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3884 from stonezdj/ldapverifycert_config

Browse Source 
Add configure parameter ldap_verify_cert to harbor.cfg
This commit is contained in:
stone 2017-12-27 15:42:20 +08:00 committed by GitHub
commit 944fd1d97a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/common/templates/adminserver/env
View File

@ -11,7 +11,7 @@ LDAP_FILTER=$ldap_filter
LDAP_UID=$ldap_uid
LDAP_SCOPE=$ldap_scope
LDAP_TIMEOUT=$ldap_timeout
LDAP_VERIFY_CERT=true
LDAP_VERIFY_CERT=$ldap_verify_cert
DATABASE_TYPE=mysql
MYSQL_HOST=$db_host
MYSQL_PORT=$db_port

3
make/harbor.cfg
View File

@ -95,6 +95,9 @@ ldap_scope = 3
#Timeout (in seconds) when connecting to an LDAP Server. The default value (and most reasonable) is 5 seconds.
ldap_timeout = 5
#Verify certificate from LDAP server
ldap_verify_cert = true
#Turn on or off the self-registration feature
self_registration = on

2
make/prepare
View File

@ -217,6 +217,7 @@ else:
ldap_uid = rcp.get("configuration", "ldap_uid")
ldap_scope = rcp.get("configuration", "ldap_scope")
ldap_timeout = rcp.get("configuration", "ldap_timeout")
ldap_verify_cert = rcp.get("configuration", "ldap_verify_cert")
db_password = rcp.get("configuration", "db_password")
db_host = rcp.get("configuration", "db_host")
db_user = rcp.get("configuration", "db_user")
@ -309,6 +310,7 @@ render(os.path.join(templates_dir, "adminserver", "env"),
ldap_filter=ldap_filter,
ldap_uid=ldap_uid,
ldap_scope=ldap_scope,
ldap_verify_cert=ldap_verify_cert,
ldap_timeout=ldap_timeout,
db_password=db_password,
db_host=db_host,