Add fix to SSL check in v-add-webmail

Author: Kristan Kenney

bin/v-add-webmail

@@ -65,7 +65,7 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
 fi
 
 # Enable SSL for webmail if available
-if [ '$SSL' = 'yes' ]; then
+if [ -f $HOMEDIR/$user/conf/mail/$domain/ssl/$domain.crt ]; then
     if [ ! -z "$WEB_SYSTEM" ]; then
         add_webmail_config "$WEB_SYSTEM" "default.stpl"
     fi

func/domain.sh

@@ -633,6 +633,18 @@ add_webmail_config() {
     chown root:$user $conf
     chmod 640 $conf
 
+    if [ "$2" = "default.tpl" ]; then
+        if [ ! -z "$WEB_SYSTEM" ]; then
+            rm -f /etc/$1/conf.d/domains/$WEBMAIL_ALIAS.$domain.conf
+            ln -s $conf /etc/$1/conf.d/domains/$WEBMAIL_ALIAS.$domain.conf
+        fi
+        if [ ! -z "$PROXY_SYSTEM" ]; then
+            rm -f /etc/$1/conf.d/domains/$WEBMAIL_ALIAS.$domain.conf
+            ln -s $conf /etc/$1/conf.d/domains/$WEBMAIL_ALIAS.$domain.conf
+        fi
+        # Clear old configurations
+        rm -rf $HOMEDIR/$user/conf/mail/$domain.*
+    fi
     if [ "$2" = "default.stpl" ]; then
         if [ ! -z "$WEB_SYSTEM" ]; then
             rm -f /etc/$1/conf.d/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
@@ -646,17 +658,6 @@ add_webmail_config() {
         rm -rf $HOMEDIR/$user/conf/mail/$domain.*
         rm -rf $HOMEDIR/$user/conf/mail/ssl.$domain.*
         rm -rf $HOMEDIR/$user/conf/mail/*nginx.$domain.*
-    else
-        if [ ! -z "$WEB_SYSTEM" ]; then
-            rm -f /etc/$1/conf.d/domains/$WEBMAIL_ALIAS.$domain.conf
-            ln -s $conf /etc/$1/conf.d/domains/$WEBMAIL_ALIAS.$domain.conf
-        fi
-        if [ ! -z "$PROXY_SYSTEM" ]; then
-            rm -f /etc/$1/conf.d/domains/$WEBMAIL_ALIAS.$domain.conf
-            ln -s $conf /etc/$1/conf.d/domains/$WEBMAIL_ALIAS.$domain.conf
-        fi
-        # Clear old configurations
-        rm -rf $HOMEDIR/$user/conf/mail/$domain.*
     fi
 }