Просмотр исходного кода

Revert "added check for web server type in SSL config, closes #626"

This reverts commit d2e01fab7613cef8698454f120d1475524334c26.
phre4k 9 лет назад
Родитель
Сommit
3f314d19bd
1 измененных файлов с 2 добавлено и 6 удалено
  1. 2 6
      bin/v-add-web-domain-ssl

+ 2 - 6
bin/v-add-web-domain-ssl

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