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

Merge branch 'patch-7' of https://github.com/thelittlefireman/bunkerized-nginx into dev

Browse Source
This commit is contained in:
bunkerity 2021-03-08 14:06:54 +01:00
commit e12b656bd5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
entrypoint/site-config.sh
View File

@ -26,12 +26,12 @@ if [ "$MULTISITE" = "yes" ] ; then
sed -i "/^${server}_.*=.*/d" "${NGINX_PREFIX}nginx.env" sed -i "/^${server}_.*=.*/d" "${NGINX_PREFIX}nginx.env"
fi fi
done done
for var in $(env) ; do for var in $(compgen -e) ; do
name=$(echo "$var" | cut -d '=' -f 1) name=$(echo "$var")
check=$(echo "$name" | grep "^$1_") check=$(echo "$name" | grep "^$1_")
if [ "$check" != "" ] ; then if [ "$check" != "" ] ; then
repl_name=$(echo "$name" | sed "s~${1}_~~") repl_name=$(echo "$name" | sed "s~${1}_~~")
repl_value=$(echo "$var" | sed "s~${name}=~~") repl_value=$(echo "${!var}")
read -r "$repl_name" <<< $repl_value read -r "$repl_name" <<< $repl_value
sed -i "/^${repl_name}=.*/d" "${NGINX_PREFIX}nginx.env" sed -i "/^${repl_name}=.*/d" "${NGINX_PREFIX}nginx.env"
sed -i "/^${name}=.*/d" "${NGINX_PREFIX}nginx.env" sed -i "/^${name}=.*/d" "${NGINX_PREFIX}nginx.env"

4
entrypoint/utils.sh
View File

@ -26,10 +26,10 @@ function has_value() {
echo "ok" echo "ok"
return 0 return 0
fi fi
for var in $(env) ; do for var in $(compgen -e) ; do
domain=$(echo "$var" | cut -d '_' -f 1) domain=$(echo "$var" | cut -d '_' -f 1)
name=$(echo "$var" | cut -d '=' -f 1 | sed "s~${domain}_~~") name=$(echo "$var" | cut -d '=' -f 1 | sed "s~${domain}_~~")
value=$(echo "$var" | sed "s~${domain}_${name}=~~") value=$(echo "${!var}")
if [ "$name" == "$1" ] && [ "$value" == "$2" ] ; then if [ "$name" == "$1" ] && [ "$value" == "$2" ] ; then
echo "ok" echo "ok"
return 0 return 0