Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-30 06:03:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7240 from ninjadq/fix_upstream_config_file_of_notary

Browse Source 
Fix: copy upstream file to nginx config file
This commit is contained in:
Qian Deng 2019-03-28 13:23:43 +08:00 committed by GitHub
commit d81dabc208
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
make/photon/prepare/utils/notary.py
View File

@ -76,19 +76,14 @@ def prepare_env_notary(customize_crt, nginx_config_dir):
os.path.join(notary_config_dir, "server_env")) os.path.join(notary_config_dir, "server_env"))
print("Copying nginx configuration file for notary") print("Copying nginx configuration file for notary")
notary_nginx_upstream_template_conf = os.path.join(templates_dir, "nginx", "notary.upstream.conf.jinja") shutil.copy2(
notary_server_nginx_config = os.path.join(nginx_config_dir, "notary.server.conf") os.path.join(templates_dir, "nginx", "notary.upstream.conf.jinja"),
shutil.copy2(notary_nginx_upstream_template_conf, notary_server_nginx_config) os.path.join(nginx_config_dir, "notary.upstream.conf"))
mark_file(os.path.join(notary_secret_dir, "notary-signer.crt")) mark_file(os.path.join(notary_secret_dir, "notary-signer.crt"))
mark_file(os.path.join(notary_secret_dir, "notary-signer.key")) mark_file(os.path.join(notary_secret_dir, "notary-signer.key"))
mark_file(os.path.join(notary_secret_dir, "notary-signer-ca.crt")) mark_file(os.path.join(notary_secret_dir, "notary-signer-ca.crt"))
# print("Copying sql file for notary DB")
# if os.path.exists(os.path.join(notary_config_dir, "postgresql-initdb.d")):
# shutil.rmtree(os.path.join(notary_config_dir, "postgresql-initdb.d"))
# shutil.copytree(os.path.join(notary_temp_dir, "postgresql-initdb.d"), os.path.join(notary_config_dir, "postgresql-initdb.d"))
def prepare_notary(config_dict, nginx_config_dir, ssl_cert_path, ssl_cert_key_path): def prepare_notary(config_dict, nginx_config_dir, ssl_cert_path, ssl_cert_key_path):