Merge pull request #1582 from moucho/deletedomain_error

Fix on deleting last web domain was deleting all includes in /etc/*/conf.d/vesta.conf for some usernames
This commit is contained in:
dpeca 2018-05-26 21:26:03 +02:00 committed by GitHub
commit 78bccef43c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -269,7 +269,7 @@ replace_web_config() {
fi
}
# Delete web configuartion
# Delete web configuration
del_web_config() {
conf="$HOMEDIR/$user/conf/web/$domain.$1.conf"
if [[ "$2" =~ stpl$ ]]; then
@ -291,7 +291,7 @@ del_web_config() {
# clean-up for both config styles if there is no more domains
web_domain=$(grep DOMAIN $USER_DATA/web.conf |wc -l)
if [ "$web_domain" -eq '0' ]; then
sed -i "/.*\/$user\/.*/d" /etc/$1/conf.d/vesta.conf
sed -i "/.*\/$user\/conf\/web\//d" /etc/$1/conf.d/vesta.conf
if [ -f "$conf" ]; then
rm -f $conf
fi