From ca620e59bf1eb67a59e48273c85d0452ea48ad18 Mon Sep 17 00:00:00 2001
From: thomasmckay <thomasmckay@redhat.com>
Date: Wed, 9 Sep 2020 08:23:48 -0400
Subject: [PATCH] PROJQUAY-1027 - remove nginx 'use_old_certs' (#539)

---
 conf/init/nginx_conf_create.py |  2 --
 conf/nginx/nginx.conf.jnj      | 10 ----------
 2 files changed, 12 deletions(-)

diff --git a/conf/init/nginx_conf_create.py b/conf/init/nginx_conf_create.py
index e455d39c1..f2e4b80f3 100644
--- a/conf/init/nginx_conf_create.py
+++ b/conf/init/nginx_conf_create.py
@@ -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,
diff --git a/conf/nginx/nginx.conf.jnj b/conf/nginx/nginx.conf.jnj
index c8dc1bb15..1de661ab1 100644
--- a/conf/nginx/nginx.conf.jnj
+++ b/conf/nginx/nginx.conf.jnj
@@ -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;