mirror of
https://github.com/goharbor/harbor.git
synced 2025-02-22 14:52:17 +01:00
Refator the host related config
1. Refactor host config 2. Refactor certiface config 3. Add port config 4. Add log info config Signed-off-by: Qian Deng <dengq@vmware.com>
This commit is contained in:
Qian Deng
parent
fef7702e9a
commit
74c4e243e3
@ -6,6 +6,7 @@ hostname: reg.mydomain.com
|
||||
# core, harbor
|
||||
http:
|
||||
port: 80
|
||||
|
||||
# https:
|
||||
# port: 443
|
||||
# #The path of cert and key files for nginx, they are applied only the protocol is set to https
|
||||
@ -103,7 +104,7 @@ jobservice:
|
||||
|
||||
# Log configurations
|
||||
log:
|
||||
# debug, warn, error
|
||||
# options are debug, info, warn, error
|
||||
level: info
|
||||
# Log files are rotated log_rotate_count times before being removed. If count is 0, old versions are removed rather than rotated.
|
||||
rotate_count: 50
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
PORT=8080
|
||||
LOG_LEVEL=info
|
||||
LOG_LEVEL={{log_level}}
|
||||
EXT_ENDPOINT={{public_url}}
|
||||
DATABASE_TYPE=postgresql
|
||||
POSTGRESQL_HOST={{db_host}}
|
||||
|
||||
@ -28,7 +28,7 @@ http {
|
||||
access_log /dev/stdout timed_combined;
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
listen {{http_port}};
|
||||
server_tokens off;
|
||||
# disable any limits to avoid HTTP 413 for large image uploads
|
||||
client_max_body_size 0;
|
||||
|
||||
@ -31,7 +31,7 @@ http {
|
||||
include /etc/nginx/conf.d/*.server.conf;
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
listen {{https_port}} ssl;
|
||||
# server_name harbordomain.com;
|
||||
server_tokens off;
|
||||
# SSL
|
||||
|
||||
@ -54,27 +54,35 @@ def parse_yaml_config(config_file_path):
|
||||
with open(config_file_path) as f:
|
||||
configs = yaml.load(f)
|
||||
|
||||
config_dict = {}
|
||||
config_dict['adminserver_url'] = "http://adminserver:8080"
|
||||
config_dict['registry_url'] = "http://registry:5000"
|
||||
config_dict['registry_controller_url'] = "http://registryctl:8080"
|
||||
config_dict['core_url'] = "http://core:8080"
|
||||
config_dict['token_service_url'] = "http://core:8080/service/token"
|
||||
|
||||
config_dict['jobservice_url'] = "http://jobservice:8080"
|
||||
config_dict['clair_url'] = "http://clair:6060"
|
||||
config_dict['notary_url'] = "http://notary-server:4443"
|
||||
config_dict['chart_repository_url'] = "http://chartmuseum:9999"
|
||||
config_dict = {
|
||||
'adminserver_url': "http://adminserver:8080",
|
||||
'registry_url': "http://registry:5000",
|
||||
'registry_controller_url': "http://registryctl:8080",
|
||||
'core_url': "http://core:8080",
|
||||
'token_service_url': "http://core:8080/service/token",
|
||||
'jobservice_url': 'http://jobservice:8080',
|
||||
'clair_url': 'http://clair:6060',
|
||||
'notary_url': 'http://notary-server:4443',
|
||||
'chart_repository_url': 'http://chartmuseum:9999'
|
||||
}
|
||||
|
||||
config_dict['hostname'] = configs.get("hostname")
|
||||
config_dict['protocol'] = configs.get("ui_url_protocol")
|
||||
config_dict['public_url'] = config_dict['protocol'] + "://" + config_dict['hostname']
|
||||
http_config = configs.get('http')
|
||||
https_config = configs.get('https')
|
||||
|
||||
if https_config:
|
||||
config_dict['protocol'] = 'https'
|
||||
config_dict['https_port'] = https_config.get('port', 443)
|
||||
config_dict['cert_path'] = https_config.get("certificate")
|
||||
config_dict['cert_key_path'] = https_config.get("private_key")
|
||||
else:
|
||||
config_dict['protocol'] = 'http'
|
||||
config_dict['http_port'] = http_config.get('port', 80)
|
||||
|
||||
# secure configs
|
||||
if config_dict['protocol'] == "https":
|
||||
config_dict['cert_path'] = configs.get("ssl_cert")
|
||||
config_dict['cert_key_path'] = configs.get("ssl_cert_key")
|
||||
if configs.get('external_url'):
|
||||
config_dict['public_url'] = configs['external_url']
|
||||
else:
|
||||
config_dict['public_url'] = '{protocol}://{hostname}'.format(**config_dict)
|
||||
|
||||
|
||||
# DB configs
|
||||
@ -94,12 +102,30 @@ def parse_yaml_config(config_file_path):
|
||||
config_dict['harbor_admin_password'] = configs.get("harbor_admin_password")
|
||||
|
||||
# Registry storage configs
|
||||
storage_config = configs.get('storage') or {}
|
||||
config_dict['storage_provider_name'] = storage_config.get("registry_storage_provider_name") or ''
|
||||
config_dict['storage_provider_config'] = storage_config.get("registry_storage_provider_config") or ''
|
||||
# yaml requires 1 or more spaces between the key and value
|
||||
config_dict['storage_provider_config'] = config_dict['storage_provider_config'].replace(":", ": ", 1)
|
||||
config_dict['registry_custom_ca_bundle_path'] = storage_config.get("registry_custom_ca_bundle") or ''
|
||||
storage_config = configs.get('storage_service') or {}
|
||||
if configs.get('filesystem'):
|
||||
print('handle filesystem')
|
||||
elif configs.get('azure'):
|
||||
print('handle azure')
|
||||
elif configs.get('gcs'):
|
||||
print('handle gcs')
|
||||
elif configs.get('s3'):
|
||||
print('handle s3')
|
||||
elif configs.get('swift'):
|
||||
print('handle swift')
|
||||
elif configs.get('oss'):
|
||||
print('handle oss')
|
||||
else:
|
||||
config_dict['storage_provider_name'] = 'filesystem'
|
||||
config_dict['storage_provider_config'] = ''
|
||||
config_dict['registry_custom_ca_bundle_path'] = storage_config.get("ca_bundle") or ''
|
||||
|
||||
|
||||
# config_dict['storage_provider_name'] = storage_config.get("registry_storage_provider_name") or ''
|
||||
# config_dict['storage_provider_config'] = storage_config.get("registry_storage_provider_config") or ''
|
||||
# # yaml requires 1 or more spaces between the key and value
|
||||
# config_dict['storage_provider_config'] = config_dict['storage_provider_config'].replace(":", ": ", 1)
|
||||
# config_dict['registry_custom_ca_bundle_path'] = storage_config.get("registry_custom_ca_bundle") or ''
|
||||
|
||||
|
||||
# Clair configs
|
||||
@ -112,7 +138,8 @@ def parse_yaml_config(config_file_path):
|
||||
|
||||
|
||||
# jobservice config
|
||||
config_dict['max_job_workers'] = configs.get("max_job_workers")
|
||||
js_config = configs.get('jobservice', {})
|
||||
config_dict['max_job_workers'] = js_config.get("max_job_workers", 10)
|
||||
config_dict['jobservice_secret'] = generate_random_string(16)
|
||||
|
||||
|
||||
|
||||
@ -22,11 +22,15 @@ def prepare_nginx(config_dict):
|
||||
def render_nginx_template(config_dict):
|
||||
if config_dict['protocol'] == "https":
|
||||
render_jinja(nginx_https_conf_template, nginx_conf,
|
||||
ssl_cert = SSL_CERT_PATH,
|
||||
ssl_cert_key = SSL_CERT_KEY_PATH)
|
||||
ssl_cert=SSL_CERT_PATH,
|
||||
ssl_cert_key=SSL_CERT_KEY_PATH,
|
||||
https_port=config_dict['https_port'])
|
||||
location_file_pattern = CUSTOM_NGINX_LOCATION_FILE_PATTERN_HTTPS
|
||||
else:
|
||||
render_jinja(nginx_http_conf_template, nginx_conf)
|
||||
render_jinja(
|
||||
nginx_http_conf_template,
|
||||
nginx_conf,
|
||||
http_port=config_dict['http_port'])
|
||||
location_file_pattern = CUSTOM_NGINX_LOCATION_FILE_PATTERN_HTTP
|
||||
copy_nginx_location_configs_if_exist(nginx_template_ext_dir, nginx_confd_dir, location_file_pattern)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user