Bläddra i källkod

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

phre4k 10 år sedan
förälder
incheckning
d2e01fab76
1 ändrade filer med 6 tillägg och 2 borttagningar
  1. 6 2
      bin/v-add-web-domain-ssl

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

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