mirror of
https://github.com/bunkerity/bunkerized-nginx
synced 2023-12-13 21:30:18 +01:00
Merge branch 'patch-7' of https://github.com/thelittlefireman/bunkerized-nginx into dev
This commit is contained in:
commit
e12b656bd5
2 changed files with 5 additions and 5 deletions
|
@ -26,12 +26,12 @@ if [ "$MULTISITE" = "yes" ] ; then
|
|||
sed -i "/^${server}_.*=.*/d" "${NGINX_PREFIX}nginx.env"
|
||||
fi
|
||||
done
|
||||
for var in $(env) ; do
|
||||
name=$(echo "$var" | cut -d '=' -f 1)
|
||||
for var in $(compgen -e) ; do
|
||||
name=$(echo "$var")
|
||||
check=$(echo "$name" | grep "^$1_")
|
||||
if [ "$check" != "" ] ; then
|
||||
repl_name=$(echo "$name" | sed "s~${1}_~~")
|
||||
repl_value=$(echo "$var" | sed "s~${name}=~~")
|
||||
repl_value=$(echo "${!var}")
|
||||
read -r "$repl_name" <<< $repl_value
|
||||
sed -i "/^${repl_name}=.*/d" "${NGINX_PREFIX}nginx.env"
|
||||
sed -i "/^${name}=.*/d" "${NGINX_PREFIX}nginx.env"
|
||||
|
|
|
@ -26,10 +26,10 @@ function has_value() {
|
|||
echo "ok"
|
||||
return 0
|
||||
fi
|
||||
for var in $(env) ; do
|
||||
for var in $(compgen -e) ; do
|
||||
domain=$(echo "$var" | cut -d '_' -f 1)
|
||||
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
|
||||
echo "ok"
|
||||
return 0
|
||||
|
|
Loading…
Reference in a new issue