mirror of https://github.com/goharbor/harbor.git
Merge e791c143d0
into 8431c9c30a
This commit is contained in:
commit
e1eeb45108
|
@ -41,6 +41,10 @@ https:
|
||||||
# And when it enabled the hostname will no longer used
|
# And when it enabled the hostname will no longer used
|
||||||
# external_url: https://reg.mydomain.com:8433
|
# external_url: https://reg.mydomain.com:8433
|
||||||
|
|
||||||
|
# Uncomment relativeurls if you want to return relative URLs in Location headers
|
||||||
|
# And when it enabled the client is responsible for resolving the correct URL
|
||||||
|
# relativeurls: true
|
||||||
|
|
||||||
# The initial password of Harbor admin
|
# The initial password of Harbor admin
|
||||||
# It only works in first time to install harbor
|
# It only works in first time to install harbor
|
||||||
# Remember Change the admin password from UI after launching Harbor.
|
# Remember Change the admin password from UI after launching Harbor.
|
||||||
|
|
|
@ -45,6 +45,9 @@ redis:
|
||||||
maxactive: 500
|
maxactive: 500
|
||||||
idletimeout: 60s
|
idletimeout: 60s
|
||||||
http:
|
http:
|
||||||
|
{% if relativeurls %}
|
||||||
|
relativeurls: true
|
||||||
|
{% endif %}
|
||||||
{% if internal_tls.enabled %}
|
{% if internal_tls.enabled %}
|
||||||
addr: :5443
|
addr: :5443
|
||||||
tls:
|
tls:
|
||||||
|
|
|
@ -144,6 +144,12 @@ def parse_yaml_config(config_file_path, with_trivy):
|
||||||
else:
|
else:
|
||||||
config_dict['public_url'] = '{protocol}://{hostname}:{http_port}'.format(**config_dict)
|
config_dict['public_url'] = '{protocol}://{hostname}:{http_port}'.format(**config_dict)
|
||||||
|
|
||||||
|
# relativeurls config
|
||||||
|
if configs.get('relativeurls'):
|
||||||
|
config_dict['relativeurls'] = configs.get('relativeurls')
|
||||||
|
else:
|
||||||
|
config_dict['relativeurls'] = False
|
||||||
|
|
||||||
# DB configs
|
# DB configs
|
||||||
db_configs = configs.get('database')
|
db_configs = configs.get('database')
|
||||||
if db_configs:
|
if db_configs:
|
||||||
|
|
Loading…
Reference in New Issue