|
@@ -90,15 +90,11 @@ if [ -x $WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/$template.sh ]; then
|
|
|
$user $domain $ip $HOMEDIR $sdocroot
|
|
$user $domain $ip $HOMEDIR $sdocroot
|
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
-# Checking web config include
|
|
|
|
|
|
|
+# Checking web config
|
|
|
web_conf="/etc/$WEB_SYSTEM/conf.d/vesta.conf"
|
|
web_conf="/etc/$WEB_SYSTEM/conf.d/vesta.conf"
|
|
|
-web_include=$(grep "$conf" $web_conf )
|
|
|
|
|
-if [ -z "$web_include" ] && [ "$WEB_SYSTEM" != 'nginx' ]; then
|
|
|
|
|
|
|
+if [ -z "$(grep "$conf" $web_conf)" ]; then
|
|
|
echo "Include $conf" >> $web_conf
|
|
echo "Include $conf" >> $web_conf
|
|
|
fi
|
|
fi
|
|
|
-if [ -z "$web_include" ] && [ "$WEB_SYSTEM" = 'nginx' ]; then
|
|
|
|
|
- echo "include $conf;" >> $web_conf
|
|
|
|
|
-fi
|
|
|
|
|
|
|
|
|
|
# Checking proxy
|
|
# Checking proxy
|
|
|
if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
|
|
if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
|