github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 21:04:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix for nginxless configuration

Browse source
This commit is contained in:
Serghey Rodin 2014-02-11 17:49:45 +02:00
commit 59abdee5da
1 changed files with 27 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

53
bin/v-rebuild-web-domains
View file

@ -69,7 +69,7 @@ if [ "$domain_counter" -lt 1 ]; then
# Deleting web configs # Deleting web configs
rm -f $HOMEDIR/$user/conf/web/* rm -f $HOMEDIR/$user/conf/web/*
sed -i "/.*\/$user\/.*$WEB_SYSTEM.conf/d" $web_conf sed -i "/.*\/$user\/.*$WEB_SYSTEM.conf/d" $web_conf
if [ -e "$proxy_conf" ]; then if [ ! -z "$PROXY_SYSTEM" ]; then
sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
fi fi
@ -103,34 +103,35 @@ else
fi fi
# Checking proxy # Checking proxy
if [ "$proxy_change" = 'yes' ]; then if [ ! -z "$PROXY_SYSTEM" ]; then
tmp_conf="$HOMEDIR/$user/conf/web/tmp_$PROXY_SYSTEM.conf" if [ "$proxy_change" = 'yes' ]; then
conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf" tmp_conf="$HOMEDIR/$user/conf/web/tmp_$PROXY_SYSTEM.conf"
mv $tmp_conf $conf conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
proxy_include=$(grep "$conf" $proxy_conf ) mv $tmp_conf $conf
if [ -z "$proxy_include" ]; then proxy_include=$(grep "$conf" $proxy_conf )
echo "include $conf;" >> $proxy_conf if [ -z "$proxy_include" ]; then
echo "include $conf;" >> $proxy_conf
fi
else
conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
rm -f $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf
fi fi
else
conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
rm -f $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf
fi
# Checking SSL proxy # Checking SSL proxy
if [ "$proxy_change" = 'yes' ] && [ "$ssl_change" = 'yes' ]; then if [ "$proxy_change" = 'yes' ] && [ "$ssl_change" = 'yes' ]; then
tmp_conf="$HOMEDIR/$user/conf/web/tmp_s$PROXY_SYSTEM.conf" tmp_conf="$HOMEDIR/$user/conf/web/tmp_s$PROXY_SYSTEM.conf"
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
mv $tmp_conf $conf mv $tmp_conf $conf
proxy_include=$(grep "$conf" $proxy_conf ) proxy_include=$(grep "$conf" $proxy_conf )
if [ -z "$proxy_include" ]; then if [ -z "$proxy_include" ]; then
echo "include $conf;" >> $proxy_conf echo "include $conf;" >> $proxy_conf
fi
else
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf
fi fi
else
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $proxy_conf
rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf
fi fi
fi fi