From 9e9ac0adee71c894c95b5e542e41d5084bfb08be Mon Sep 17 00:00:00 2001 From: Asif Bacchus Date: Thu, 17 Oct 2019 16:27:59 -0600 Subject: [PATCH] fix multiple errors switching test server blocks --- build/entrypoint.sh | 16 ++++------------ build/sites/note | 2 ++ 2 files changed, 6 insertions(+), 12 deletions(-) create mode 100644 build/sites/note diff --git a/build/entrypoint.sh b/build/entrypoint.sh index 0d4a9ab..85bbe92 100755 --- a/build/entrypoint.sh +++ b/build/entrypoint.sh @@ -32,14 +32,10 @@ if [ "$TLS13_ONLY" = FALSE ]; then mv /etc/nginx/config/mozIntermediate_ssl.conf.disabled \ /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/note" ]; then + # activate SSL test server block & deactivate normal one 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 @@ -54,14 +50,10 @@ elif [ "$TLS13_ONLY" = TRUE ]; then mv /etc/nginx/config/mozModern_ssl.conf.disabled \ /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/note" ]; then + # activate SSL test server block & deactivate normal one 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 diff --git a/build/sites/note b/build/sites/note new file mode 100644 index 0000000..bb0271a --- /dev/null +++ b/build/sites/note @@ -0,0 +1,2 @@ +This entire directory should be overwritten via bind-mount in a production +environment \ No newline at end of file