From 4ec127184d3eeccbedc47d32911f3234e14efb7d Mon Sep 17 00:00:00 2001 From: Asif Bacchus Date: Thu, 17 Oct 2019 16:17:16 -0600 Subject: [PATCH] deactivate standard test page when SSL active --- build/entrypoint.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/build/entrypoint.sh b/build/entrypoint.sh index 355c9cb..0d4a9ab 100755 --- a/build/entrypoint.sh +++ b/build/entrypoint.sh @@ -33,10 +33,16 @@ if [ "$TLS13_ONLY" = FALSE ]; then /etc/nginx/config/mozIntermediate_ssl.conf # activate SSL test server block if it exists - if [ -f "/etc/nginx/sites/05-test-secured.conf" ]; then + if [ -f "/etc/nginx/sites/05-test_secured.conf" ]; then mv /etc/nginx/sites/05-test_secured.conf.disabled \ /etc/nginx/sites/05-test_secured.conf fi + + # deactivate standard test server block if it exists + if [ -f "/etc/nginx/sites/05-test_nonsecured.conf" ]; then + mv /etc/nginx/sites/05-test_nonsecured.conf \ + /etc/nginx/sites/05-test_nonsecured.conf.disabled + fi fi elif [ "$TLS13_ONLY" = TRUE ]; then if [ -f "/certs/fullchain.pem" ] && \ @@ -49,10 +55,16 @@ elif [ "$TLS13_ONLY" = TRUE ]; then /etc/nginx/config/mozModern_ssl.conf # activate SSL test server block if it exists - if [ -f "/etc/nginx/sites/05-test-secured.conf" ]; then + if [ -f "/etc/nginx/sites/05-test_secured.conf" ]; then mv /etc/nginx/sites/05-test_secured.conf.disabled \ /etc/nginx/sites/05-test_secured.conf fi + + # deactivate standard test server block if it exists + if [ -f "/etc/nginx/sites/05-test_nonsecured.conf" ]; then + mv /etc/nginx/sites/05-test_nonsecured.conf \ + /etc/nginx/sites/05-test_nonsecured.conf.disabled + fi fi fi