Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-19 21:32:24 +01:00
Code Issues Projects Releases Wiki Activity

Update the path of server.key and server.crt

Browse Source 
change the path of cert key paris to prevent futrue issues.

Signed-off-by: Qian Deng <dengq@vmware.com>
This commit is contained in:
Qian Deng 2019-05-06 14:14:21 +08:00
parent 3dfebed98e
commit cd9932db23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make/photon/prepare/templates/docker_compose/docker-compose.yml.jinja
View File

@ -256,8 +256,8 @@ services:
volumes: volumes:
- ./common/config/nginx:/etc/nginx:z - ./common/config/nginx:/etc/nginx:z
{% if protocol == 'https' %} {% if protocol == 'https' %}
- {{cert_key_path}}:/etc/nginx/cert/server.key:z - {{cert_key_path}}:/etc/cert/server.key:z
- {{cert_path}}:/etc/nginx/cert/server.crt:z - {{cert_path}}:/etc/cert/server.crt:z
{% endif %} {% endif %}
networks: networks:
- harbor - harbor

4
make/photon/prepare/utils/cert.py
View File

@ -7,8 +7,8 @@ from functools import wraps
from .misc import mark_file from .misc import mark_file
from .misc import generate_random_string from .misc import generate_random_string
SSL_CERT_PATH = os.path.join("/etc/nginx/cert", "server.crt") SSL_CERT_PATH = os.path.join("/etc/cert", "server.crt")
SSL_CERT_KEY_PATH = os.path.join("/etc/nginx/cert", "server.key") SSL_CERT_KEY_PATH = os.path.join("/etc/cert", "server.key")
secret_keys_dir = '/secret/keys' secret_keys_dir = '/secret/keys'

6
make/photon/prepare/utils/nginx.py
View File

@ -13,9 +13,9 @@ nginx_https_conf_template = os.path.join(templates_dir, "nginx", "nginx.https.co
nginx_http_conf_template = os.path.join(templates_dir, "nginx", "nginx.http.conf.jinja") nginx_http_conf_template = os.path.join(templates_dir, "nginx", "nginx.http.conf.jinja")
nginx_template_ext_dir = os.path.join(templates_dir, 'nginx', 'ext') nginx_template_ext_dir = os.path.join(templates_dir, 'nginx', 'ext')
cert_dir = Path(os.path.join(config_dir, "nginx", "cert")) cert_dir = Path(os.path.join(config_dir, "cert"))
ssl_cert_key = Path(os.path.join(config_dir, "nginx", "cert", 'server.key')) ssl_cert_key = Path(os.path.join(cert_dir, 'server.key'))
ssl_cert_cert = Path(os.path.join(config_dir, "nginx", "cert", 'server.crt')) ssl_cert_cert = Path(os.path.join(cert_dir, 'server.crt'))
CUSTOM_NGINX_LOCATION_FILE_PATTERN_HTTPS = 'harbor.https.*.conf' CUSTOM_NGINX_LOCATION_FILE_PATTERN_HTTPS = 'harbor.https.*.conf'
CUSTOM_NGINX_LOCATION_FILE_PATTERN_HTTP = 'harbor.http.*.conf' CUSTOM_NGINX_LOCATION_FILE_PATTERN_HTTP = 'harbor.http.*.conf'