mirror of
https://github.com/goharbor/harbor.git
synced 2024-09-10 04:58:08 +02:00
Merge pull request #3884 from stonezdj/ldapverifycert_config
Add configure parameter ldap_verify_cert to harbor.cfg
This commit is contained in:
commit
944fd1d97a
@ -11,7 +11,7 @@ LDAP_FILTER=$ldap_filter
|
|||||||
LDAP_UID=$ldap_uid
|
LDAP_UID=$ldap_uid
|
||||||
LDAP_SCOPE=$ldap_scope
|
LDAP_SCOPE=$ldap_scope
|
||||||
LDAP_TIMEOUT=$ldap_timeout
|
LDAP_TIMEOUT=$ldap_timeout
|
||||||
LDAP_VERIFY_CERT=true
|
LDAP_VERIFY_CERT=$ldap_verify_cert
|
||||||
DATABASE_TYPE=mysql
|
DATABASE_TYPE=mysql
|
||||||
MYSQL_HOST=$db_host
|
MYSQL_HOST=$db_host
|
||||||
MYSQL_PORT=$db_port
|
MYSQL_PORT=$db_port
|
||||||
|
@ -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.
|
#Timeout (in seconds) when connecting to an LDAP Server. The default value (and most reasonable) is 5 seconds.
|
||||||
ldap_timeout = 5
|
ldap_timeout = 5
|
||||||
|
|
||||||
|
#Verify certificate from LDAP server
|
||||||
|
ldap_verify_cert = true
|
||||||
|
|
||||||
#Turn on or off the self-registration feature
|
#Turn on or off the self-registration feature
|
||||||
self_registration = on
|
self_registration = on
|
||||||
|
|
||||||
|
@ -217,6 +217,7 @@ else:
|
|||||||
ldap_uid = rcp.get("configuration", "ldap_uid")
|
ldap_uid = rcp.get("configuration", "ldap_uid")
|
||||||
ldap_scope = rcp.get("configuration", "ldap_scope")
|
ldap_scope = rcp.get("configuration", "ldap_scope")
|
||||||
ldap_timeout = rcp.get("configuration", "ldap_timeout")
|
ldap_timeout = rcp.get("configuration", "ldap_timeout")
|
||||||
|
ldap_verify_cert = rcp.get("configuration", "ldap_verify_cert")
|
||||||
db_password = rcp.get("configuration", "db_password")
|
db_password = rcp.get("configuration", "db_password")
|
||||||
db_host = rcp.get("configuration", "db_host")
|
db_host = rcp.get("configuration", "db_host")
|
||||||
db_user = rcp.get("configuration", "db_user")
|
db_user = rcp.get("configuration", "db_user")
|
||||||
@ -309,6 +310,7 @@ render(os.path.join(templates_dir, "adminserver", "env"),
|
|||||||
ldap_filter=ldap_filter,
|
ldap_filter=ldap_filter,
|
||||||
ldap_uid=ldap_uid,
|
ldap_uid=ldap_uid,
|
||||||
ldap_scope=ldap_scope,
|
ldap_scope=ldap_scope,
|
||||||
|
ldap_verify_cert=ldap_verify_cert,
|
||||||
ldap_timeout=ldap_timeout,
|
ldap_timeout=ldap_timeout,
|
||||||
db_password=db_password,
|
db_password=db_password,
|
||||||
db_host=db_host,
|
db_host=db_host,
|
||||||
|
Loading…
Reference in New Issue
Block a user