vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

v1 registry flags for nginx server blocks (#3307)

Browse source
This commit is contained in:
Kenny Lee Sin Cheong 2019-01-15 15:22:59 -05:00 • committed by GitHub
parent 6d5ec4eddf
commit bae3a47ee2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
conf/init/nginx_conf_create.py
View file

@ -18,12 +18,18 @@ def write_config(filename, **kwargs):
f.write(rendered)
def generate_nginx_config():
def generate_nginx_config(config):
"""
Generates nginx config from the app config
"""
config = config or {}
use_https = os.path.exists(os.path.join(QUAYCONF_DIR, 'stack/ssl.key'))
write_config(os.path.join(QUAYCONF_DIR, 'nginx/nginx.conf'), use_https=use_https)
use_old_certs = os.path.exists(os.path.join(QUAYCONF_DIR, 'stack/ssl.old.key'))
v1_only_domain = config.get('V1_ONLY_DOMAIN', None)
write_config(os.path.join(QUAYCONF_DIR, 'nginx/nginx.conf'), use_https=use_https,
use_old_certs=use_old_certs,
v1_only_domain=v1_only_domain)
def generate_server_config(config):
@ -48,4 +54,4 @@ if __name__ == "__main__":
else:
config = None
generate_server_config(config)
generate_nginx_config()
generate_nginx_config(config)