Makussu/bunkerweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix truncated variables (last commit)

Browse Source
This commit is contained in:
thelittlefireman 2021-03-15 22:54:30 +01:00
parent 6a714e2ece
commit 89ca91b3ff
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
entrypoint/site-config.sh
View File

@ -60,12 +60,12 @@ replace_in_file "${NGINX_PREFIX}server.conf" "%SERVER_TOKENS%" "$SERVER_TOKENS"
# reverse proxy # reverse proxy
if [ "$USE_REVERSE_PROXY" = "yes" ] ; then if [ "$USE_REVERSE_PROXY" = "yes" ] ; then
i=1 i=1
for var in $(env) ; do for var in $(compgen -e) ; do
check1=$(echo "$var" | grep "^REVERSE_PROXY_URL") check1=$(echo "$var" | grep "^REVERSE_PROXY_URL")
check2=$(echo "$var" | grep "^${1}_REVERSE_PROXY_URL") check2=$(echo "$var" | grep "^${1}_REVERSE_PROXY_URL")
if [ "$check1" != "" ] || [ "$check2" != "" ] ; then if [ "$check1" != "" ] || [ "$check2" != "" ] ; then
name=$(echo "$var" | cut -d '=' -f 1) name=$(echo "$var")
value=$(echo "$var" | sed "s/${name}=//") value=$(echo "${!var}")
host=$(echo "$name" | sed "s/URL/HOST/") host=$(echo "$name" | sed "s/URL/HOST/")
host_value=$(env | grep "^${host}=" | sed "s/${host}=//") host_value=$(env | grep "^${host}=" | sed "s/${host}=//")
ws=$(echo "$name" | sed "s/URL/WS/") ws=$(echo "$name" | sed "s/URL/WS/")
@ -423,11 +423,11 @@ fi
# custom errors # custom errors
ERRORS="" ERRORS=""
for var in $(env) ; do for var in $(compgen -e) ; do
var_name=$(echo "$var" | cut -d '=' -f 1 | cut -d '_' -f 1) var_name=$(echo "$var" | cut -d '_' -f 1)
if [ "z${var_name}" = "zERROR" ] ; then if [ "z${var_name}" = "zERROR" ] ; then
err_code=$(echo "$var" | cut -d '=' -f 1 | cut -d '_' -f 2) err_code=$(echo "$var" | cut -d '_' -f 2)
err_page=$(echo "$var" | cut -d '=' -f 2) err_page=$(echo "${!var}")
cp /opt/confs/error.conf ${NGINX_PREFIX}error-${err_code}.conf cp /opt/confs/error.conf ${NGINX_PREFIX}error-${err_code}.conf
replace_in_file "${NGINX_PREFIX}error-${err_code}.conf" "%CODE%" "$err_code" replace_in_file "${NGINX_PREFIX}error-${err_code}.conf" "%CODE%" "$err_code"
replace_in_file "${NGINX_PREFIX}error-${err_code}.conf" "%PAGE%" "$err_page" replace_in_file "${NGINX_PREFIX}error-${err_code}.conf" "%PAGE%" "$err_page"