docker/quay
1
0
Fork 0
mirror of https://github.com/quay/quay.git synced 2026-01-26 06:21:37 +03:00
Code Activity

PROJQUAY-1027 - remove nginx 'use_old_certs' (#539)

Browse Source
This commit is contained in:
thomasmckay
2020-09-09 08:23:48 -04:00
committed by GitHub
parent f99cdf87e7
commit ca620e59bf
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
conf/init/nginx_conf_create.py
View File

@@ -70,7 +70,6 @@ def generate_nginx_config(config):
"""
config = config or {}
use_https = os.path.exists(os.path.join(QUAYCONF_DIR, "stack/ssl.key"))
use_old_certs = os.path.exists(os.path.join(QUAYCONF_DIR, "stack/ssl.old.key"))
v1_only_domain = config.get("V1_ONLY_DOMAIN", None)
enable_rate_limits = config.get("FEATURE_RATE_LIMITS", False)
ssl_protocols = config.get("SSL_PROTOCOLS", SSL_PROTOCOL_DEFAULTS)
@@ -79,7 +78,6 @@ def generate_nginx_config(config):
write_config(
os.path.join(QUAYCONF_DIR, "nginx/nginx.conf"),
use_https=use_https,
use_old_certs=use_old_certs,
enable_rate_limits=enable_rate_limits,
v1_only_domain=v1_only_domain,
ssl_protocols=ssl_protocols,

10
conf/nginx/nginx.conf.jnj
View File

@@ -64,13 +64,8 @@ http {
server_name {{ v1_only_domain }};
{% if use_old_certs %}
ssl_certificate ../stack/ssl.old.cert;
ssl_certificate_key ../stack/ssl.old.key;
{% else %}
ssl_certificate ../stack/ssl.cert;
ssl_certificate_key ../stack/ssl.key;
{% endif %}
listen 8443 ssl;
@@ -85,13 +80,8 @@ http {
server {
server_name {{ v1_only_domain }};
{% if use_old_certs %}
ssl_certificate ../stack/ssl.old.cert;
ssl_certificate_key ../stack/ssl.old.key;
{% else %}
ssl_certificate ../stack/ssl.cert;
ssl_certificate_key ../stack/ssl.key;
{% endif %}
include server-base.conf;