Update webmail deletion routines

Author: Kristan Kenney

bin/v-delete-mail-domain

@@ -63,13 +63,13 @@ if [ "$DKIM" = 'yes' ] && [ -e "$USER_DATA/dns/$domain.conf" ]; then
 fi
 
 # Delete SSL certificates and configuration
-if [ "$SSL" = 'yes' ] || [ -f $HOMEDIR/$user/conf/mail/$domain/ssl/$domain.crt ]; then
+if [ "$SSL" = 'yes' ] || [ -e "$HOMEDIR/$user/conf/mail/$domain/ssl/$domain.crt" ]; then
     $BIN/v-delete-mail-domain-ssl $user $domain 
 fi
 
 # Delete webmail configuration if it exists
 if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
-    $BIN/v-delete-webmail $user $admin 'yes'
+    $BIN/v-delete-webmail $user $domain 'yes'
 fi
 
 #----------------------------------------------------------#

bin/v-delete-mail-domain-ssl

@@ -42,6 +42,7 @@ is_object_value_exist 'mail' 'DOMAIN' "$domain" '$SSL'
 # Delete mail domain SSL configuration
 del_mail_ssl_config
 del_mail_ssl_certificates
+del_webmail_ssl_config
 
 #----------------------------------------------------------#
 #                       Hestia                              #

bin/v-delete-webmail

@@ -41,6 +41,7 @@ is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 
 # Delete webmail configuration
 del_webmail_config
+del_webmail_ssl_config
 
 #----------------------------------------------------------#
 #                       Hestia                              #

func/domain.sh

@@ -758,17 +758,13 @@ add_webmail_config() {
 # Delete webmail support
 del_webmail_config() {
     if [ ! -z "$WEB_SYSTEM" ]; then 
-        rm -f $HOMEDIR/$user/conf/mail/$domain/$WEB_SYSTEM.*conf
+        rm -f $HOMEDIR/$user/conf/mail/$domain/$WEB_SYSTEM.conf
         rm -f /etc/$WEB_SYSTEM/conf.d/domains/$WEBMAIL_ALIAS.$domain.conf
-        rm -f $HOMEDIR/$user/conf/mail/$domain/$WEB_SYSTEM.*ssl.conf
-        rm -f /etc/$WEB_SYSTEM/conf.d/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
     fi
 
     if [ ! -z "$PROXY_SYSTEM" ]; then
         rm -f $HOMEDIR/$user/conf/mail/$domain/$PROXY_SYSTEM.*conf
         rm -f /etc/$PROXY_SYSTEM/conf.d/domains/$WEBMAIL_ALIAS.$domain.conf
-        rm -f $HOMEDIR/$user/conf/mail/$domain/$PROXY_SYSTEM.*ssl.conf
-        rm -f /etc/$PROXY_SYSTEM/conf.d/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
     fi
 }