Fixes in v-rebuild-mail-domain-ssl

Author: Kristan Kenney

bin/v-rebuild-mail-domain-ssl

@@ -28,18 +28,12 @@ export PATH=$PATH:/usr/sbin
 #----------------------------------------------------------#
 
 check_args '2' "$#" 'USER DOMAIN [RESTART]'
-is_format_valid 'user' 'domain'
-
-is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
-is_object_valid 'user' 'DOMAIN' "$domain"
+is_format_valid 'user' 'domain' 
 is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
-
-is_format_valid 'user' 'domain'
-
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
-is_object_valid 'dns' 'DOMAIN' "$domain"
+is_object_valid 'mail' 'DOMAIN' "$domain"
+is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 
 
 #----------------------------------------------------------#
@@ -50,10 +44,21 @@ is_object_valid 'dns' 'DOMAIN' "$domain"
 del_mail_ssl_config
 add_mail_ssl_config
 
+# Increase value for domain
+increase_user_value "$user" '$U_MAIL_SSL'
+
+# Set SSL as enabled in configuration
+update_object_value 'mail' 'DOMAIN' "$domain" '$SSL' "yes"
+
 #----------------------------------------------------------#
 #                       Hestia                             #
 #----------------------------------------------------------#
 
+# Restarting mail server
+$BIN/v-restart-mail $restart
+$BIN/v-restart-service $IMAP_SYSTEM $restart
+check_result $? "Mail restart failed" >/dev/null
+
 # Logging
 log_event "$OK" "$ARGUMENTS"