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

condition for a proxy

Browse source
This commit is contained in:
Serghey Rodin 2013-06-19 14:59:24 +03:00
commit 82c3bad122
2 changed files with 39 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

29
bin/v-delete-web-domain
View file

@ -70,7 +70,7 @@ if [ "$SSL" = 'yes' ]; then
fi fi
# Checking proxy # Checking proxy
if [ ! -z "$PROXY" ]; then if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl" tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf" conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
del_web_config del_web_config
@ -125,19 +125,22 @@ if [ "$domains" -eq '0' ]; then
rm -f $HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf rm -f $HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf
fi fi
# Checking last SSL proxy # Proxy
conf="/etc/$PROXY_SYSTEM/conf.d/vesta.conf" if [ ! -z "$PROXY_SYSTEM" ]; then
last_sproxy=$(grep "SSL='yes'" $USER_DATA/web.conf) # Checking last SSL proxy
if [ -z "$last_sproxy" ]; then conf="/etc/$PROXY_SYSTEM/conf.d/vesta.conf"
sed -i "/.*\/$user\/.*s$PROXY_SYSTEM.conf/d" $conf last_sproxy=$(grep "SSL='yes'" $USER_DATA/web.conf)
rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf if [ -z "$last_sproxy" ]; then
fi sed -i "/.*\/$user\/.*s$PROXY_SYSTEM.conf/d" $conf
rm -f $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf
fi
# Checking last proxy # Checking last proxy
last_proxy=$(grep -v "PROXY=''" $USER_DATA/web.conf) last_proxy=$(grep -v "PROXY=''" $USER_DATA/web.conf)
if [ -z "$last_proxy" ]; then if [ -z "$last_proxy" ]; then
sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $conf sed -i "/.*\/$user\/.*$PROXY_SYSTEM.conf/d" $conf
rm -f $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf rm -f $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf
fi
fi fi
# Decrease counters # Decrease counters

43
bin/v-restore-user
View file

@ -258,7 +258,7 @@ if [ "$web" != 'no' ]; then
fi fi
# Check proxy template # Check proxy template
if [ ! -z "$PROXY" ]; then if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
if [ ! -e "$WEBTPL/$PROXY_SYSTEM/$TPL.tpl" ]; then if [ ! -e "$WEBTPL/$PROXY_SYSTEM/$TPL.tpl" ]; then
PROXY="default" PROXY="default"
if [ ! -e "$WEBTPL/$PROXY_SYSTEM/$TPL.tpl" ]; then if [ ! -e "$WEBTPL/$PROXY_SYSTEM/$TPL.tpl" ]; then
@ -322,29 +322,32 @@ if [ "$web" != 'no' ]; then
echo "Include $conf" >> $web_conf echo "Include $conf" >> $web_conf
fi fi
# Adding proxy vhost # Proxy
proxy_conf="/etc/$PROXY_SYSTEM/conf.d/vesta.conf" if [ ! -z "$PROXY_SYSTEM" ]; then
if [ ! -z "$PROXY" ]; then # Adding proxy vhost
tmp_conf="$HOMEDIR/$user/conf/web/tmp_$PROXY_SYSTEM.conf" proxy_conf="/etc/$PROXY_SYSTEM/conf.d/vesta.conf"
conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf" if [ ! -z "$PROXY" ]; then
cat $tmp_conf >> $conf tmp_conf="$HOMEDIR/$user/conf/web/tmp_$PROXY_SYSTEM.conf"
rm -f $tmp_conf conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
fi cat $tmp_conf >> $conf
proxy_include=$(grep "$conf" $proxy_conf) rm -f $tmp_conf
if [ -z "$proxy_include" ]; then fi
echo "include $conf;" >> $proxy_conf
fi
# Adding SSL proxy vhost
if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ]; then
tmp_conf="$HOMEDIR/$user/conf/web/tmp_s$PROXY_SYSTEM.conf"
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
cat $tmp_conf >> $conf
rm -f $tmp_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 fi
# Adding SSL proxy vhost
if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ]; then
tmp_conf="$HOMEDIR/$user/conf/web/tmp_s$PROXY_SYSTEM.conf"
conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
cat $tmp_conf >> $conf
rm -f $tmp_conf
proxy_include=$(grep "$conf" $proxy_conf)
if [ -z "$proxy_include" ]; then
echo "include $conf;" >> $proxy_conf
fi
fi
fi fi
fi fi