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

refactor(SITES): rename default site block files

Browse Source 
- remove test from filenames to avoid confusion
- these are production-capable files
This commit is contained in:
Asif Bacchus 2021-01-07 07:11:20 -07:00
parent 23da6ae576
commit 318e595bbd
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
build/entrypoint.sh
View File

@ -38,7 +38,7 @@ fi
# update HTTPS redirect port if SSL server test block exists # update HTTPS redirect port if SSL server test block exists
if [ -f "/etc/nginx/sites/note" ]; then if [ -f "/etc/nginx/sites/note" ]; then
printf "Updating port redirects... " printf "Updating port redirects... "
sed -i -e "s%<HTTPS_PORT>%${HTTPS_PORT}%" /etc/nginx/sites/05-test_secured.* sed -i -e "s%<HTTPS_PORT>%${HTTPS_PORT}%" /etc/nginx/sites/05-secured.*
printf "done\n" printf "done\n"
fi fi
@ -68,13 +68,13 @@ if [ -f "/certs/fullchain.pem" ]; then
# if using default setup, activate secured server block # if using default setup, activate secured server block
if [ -f "/etc/nginx/sites/note" ]; then if [ -f "/etc/nginx/sites/note" ]; then
if [ -f "/etc/nginx/sites/05-test_secured.conf.disabled" ]; then if [ -f "/etc/nginx/sites/05-secured.conf.disabled" ]; then
mv /etc/nginx/sites/05-test_secured.conf.disabled \ mv /etc/nginx/sites/05-secured.conf.disabled \
/etc/nginx/sites/05-test_secured.conf /etc/nginx/sites/05-secured.conf
fi fi
if [ -f "/etc/nginx/sites/05-test_nonsecured.conf" ]; then if [ -f "/etc/nginx/sites/05-nonsecured.conf" ]; then
mv /etc/nginx/sites/05-test_nonsecured.conf \ mv /etc/nginx/sites/05-nonsecured.conf \
/etc/nginx/sites/05-test_nonsecured.conf.disabled /etc/nginx/sites/05-nonsecured.conf.disabled
fi fi
fi fi
fi fi
@ -93,13 +93,13 @@ if [ -f "/certs/fullchain.pem" ]; then
# if using default setup, activate secure server block # if using default setup, activate secure server block
if [ -f "/etc/nginx/sites/note" ]; then if [ -f "/etc/nginx/sites/note" ]; then
if [ -f "/etc/nginx/sites/05-test_secured.conf.disabled" ]; then if [ -f "/etc/nginx/sites/05-secured.conf.disabled" ]; then
mv /etc/nginx/sites/05-test_secured.conf.disabled \ mv /etc/nginx/sites/05-secured.conf.disabled \
/etc/nginx/sites/05-test_secured.conf /etc/nginx/sites/05-secured.conf
fi fi
if [ -f "/etc/nginx/sites/05-test_nonsecured.conf" ]; then if [ -f "/etc/nginx/sites/05-nonsecured.conf" ]; then
mv /etc/nginx/sites/05-test_nonsecured.conf \ mv /etc/nginx/sites/05-nonsecured.conf \
/etc/nginx/sites/05-test_nonsecured.conf.disabled /etc/nginx/sites/05-nonsecured.conf.disabled
fi fi
fi fi
fi fi
@ -109,11 +109,11 @@ else
for f in /etc/nginx/ssl-config/*; do mv "$f" "${f%%.*}.conf.disabled"; done for f in /etc/nginx/ssl-config/*; do mv "$f" "${f%%.*}.conf.disabled"; done
# if using default setup, ensure secure server block disabled # if using default setup, ensure secure server block disabled
if [ -f "/etc/nginx/sites/note" ]; then if [ -f "/etc/nginx/sites/note" ]; then
if [ -f "/etc/nginx/sites/05-test_secured.conf" ]; then if [ -f "/etc/nginx/sites/05-secured.conf" ]; then
mv /etc/nginx/sites/05-test_secured.conf /etc/nginx/sites/05-test_secured.conf.disabled mv /etc/nginx/sites/05-secured.conf /etc/nginx/sites/05-secured.conf.disabled
fi fi
if [ -f "/etc/nginx/sites/05-test_nonsecured.conf.disabled" ]; then if [ -f "/etc/nginx/sites/05-nonsecured.conf.disabled" ]; then
mv /etc/nginx/sites/05-test_nonsecured.conf.disabled /etc/nginx/sites/05-test_nonsecured.conf mv /etc/nginx/sites/05-nonsecured.conf.disabled /etc/nginx/sites/05-nonsecured.conf
fi fi
fi fi
fi fi

0
build/sites/05-test_nonsecured.conf → build/sites/05-nonsecured.conf
View File

0
build/sites/05-test_secured.conf.disabled → build/sites/05-secured.conf.disabled
View File