ab-docker/ab-nginx
1
0
Fork 0
Code Issues Pull Requests Releases 7 Wiki Activity

fix multiple errors switching test server blocks

Browse Source
This commit is contained in:
Asif Bacchus 2019-10-17 16:27:59 -06:00
parent 4ec127184d
commit 9e9ac0adee
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/entrypoint.sh
View File

@ -32,14 +32,10 @@ if [ "$TLS13_ONLY" = FALSE ]; then
mv /etc/nginx/config/mozIntermediate_ssl.conf.disabled \ mv /etc/nginx/config/mozIntermediate_ssl.conf.disabled \
/etc/nginx/config/mozIntermediate_ssl.conf /etc/nginx/config/mozIntermediate_ssl.conf
# activate SSL test server block if it exists if [ -f "/etc/nginx/sites/note" ]; then
if [ -f "/etc/nginx/sites/05-test_secured.conf" ]; then # activate SSL test server block & deactivate normal one
mv /etc/nginx/sites/05-test_secured.conf.disabled \ mv /etc/nginx/sites/05-test_secured.conf.disabled \
/etc/nginx/sites/05-test_secured.conf /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 \ mv /etc/nginx/sites/05-test_nonsecured.conf \
/etc/nginx/sites/05-test_nonsecured.conf.disabled /etc/nginx/sites/05-test_nonsecured.conf.disabled
fi fi
@ -54,14 +50,10 @@ elif [ "$TLS13_ONLY" = TRUE ]; then
mv /etc/nginx/config/mozModern_ssl.conf.disabled \ mv /etc/nginx/config/mozModern_ssl.conf.disabled \
/etc/nginx/config/mozModern_ssl.conf /etc/nginx/config/mozModern_ssl.conf
# activate SSL test server block if it exists if [ -f "/etc/nginx/sites/note" ]; then
if [ -f "/etc/nginx/sites/05-test_secured.conf" ]; then # activate SSL test server block & deactivate normal one
mv /etc/nginx/sites/05-test_secured.conf.disabled \ mv /etc/nginx/sites/05-test_secured.conf.disabled \
/etc/nginx/sites/05-test_secured.conf /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 \ mv /etc/nginx/sites/05-test_nonsecured.conf \
/etc/nginx/sites/05-test_nonsecured.conf.disabled /etc/nginx/sites/05-test_nonsecured.conf.disabled
fi fi

2
build/sites/note Normal file
View File

@ -0,0 +1,2 @@
This entire directory should be overwritten via bind-mount in a production
environment