github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-20 05:14:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed nginx config removal

Browse source
This commit is contained in:
Serghey Rodin 2011-09-21 11:59:47 +03:00
commit 8b5615514e
2 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
bin/v_del_web_domain
View file

@ -116,6 +116,26 @@ if [ "$domains" -eq '0' ]; then
fi fi
fi fi
# Checking last nginx domain
conf='/etc/nginx/conf.d/vesta_users.conf'
last_nginx=$(grep -v "NGINX=''" $V_USERS/$user/web.conf)
last_snginx=$(echo "$last_nginx" | grep -v "SSL_CERT=''")
if [ -z "$last_snginx" ]; then
sline=$(grep -n "$V_HOME/$user/conf/snginx.conf" $conf | cut -f 1 -d : )
if [ ! -z "$sline" ]; then
sed -i "$sline d" $conf
fi
rm -f $V_HOME/$user/conf/snginx.conf
fi
if [ -z "$last_nginx" ]; then
line=$(grep -n "$V_HOME/$user/conf/nginx.conf" $conf | cut -f 1 -d : )
if [ ! -z "$line" ]; then
sed -i "$line d" $conf
fi
rm -f $V_HOME/$user/conf/nginx.conf
fi
# Decreasing ip value # Decreasing ip value
decrease_ip_value "$old_ip" decrease_ip_value "$old_ip"

4
bin/v_del_web_domain_nginx
View file

@ -79,7 +79,7 @@ update_web_domain_value '$NGINX_EXT' ''
conf='/etc/nginx/conf.d/vesta_users.conf' conf='/etc/nginx/conf.d/vesta_users.conf'
last_nginx=$(grep -v "NGINX=''" $V_USERS/$user/web.conf) last_nginx=$(grep -v "NGINX=''" $V_USERS/$user/web.conf)
last_snginx=$(echo "$last_nginx" | grep -v "SSL_CERT=''") last_snginx=$(echo "$last_nginx" | grep -v "SSL_CERT=''")
if [ -z "$last_snginx" ]; then if [ -z "$last_snginx" ]; then
sline=$(grep -n "$V_HOME/$user/conf/snginx.conf" $conf | cut -f 1 -d : ) sline=$(grep -n "$V_HOME/$user/conf/snginx.conf" $conf | cut -f 1 -d : )
if [ ! -z "$sline" ]; then if [ ! -z "$sline" ]; then
sed -i "$sline d" $conf sed -i "$sline d" $conf
@ -87,7 +87,7 @@ if [ -z "$last_snginx" ]; then
rm -f $V_HOME/$user/conf/snginx.conf rm -f $V_HOME/$user/conf/snginx.conf
fi fi
if [ -z "$last_nginx" ]; then if [ -z "$last_nginx" ]; then
line=$(grep -n "$V_HOME/$user/conf/nginx.conf" $conf | cut -f 1 -d : ) line=$(grep -n "$V_HOME/$user/conf/nginx.conf" $conf | cut -f 1 -d : )
if [ ! -z "$line" ]; then if [ ! -z "$line" ]; then
sed -i "$line d" $conf sed -i "$line d" $conf