From 859798cb34c5a337b74c1e7509609736ce1148e3 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 28 Jun 2016 14:39:11 +0300 Subject: [PATCH] hotfixes for css and domain deletion --- func/domain.sh | 5 ++--- web/templates/header.html | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/func/domain.sh b/func/domain.sh index eda517a06..f345bcf71 100644 --- a/func/domain.sh +++ b/func/domain.sh @@ -273,9 +273,8 @@ del_web_config() { web_domains=$(grep DOMAIN $USER_DATA/web.conf |wc -l) if [ "$web_domains" -eq '0' ]; then - sed -i "/.*\/$user\/.*$WEB_SYSTEM.conf/d" /etc/$1/conf.d/vesta.conf - rm -f $HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf - rm -f $HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf + sed -i "/.*\/$user\/.*$1.conf/d" /etc/$1/conf.d/vesta.conf + rm -f $conf fi } diff --git a/web/templates/header.html b/web/templates/header.html index e3f20514d..3b462a046 100644 --- a/web/templates/header.html +++ b/web/templates/header.html @@ -9,7 +9,7 @@ - +