Merge pull request #591 from Lupul/backport-0925

Backport to 1.0.6

bin/v-add-letsencrypt-domain

@@ -86,7 +86,6 @@ else
     is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
     is_object_valid 'mail' 'DOMAIN' "$domain"
     is_object_unsuspended 'mail' 'DOMAIN' "$domain"
-    is_object_value_empty 'mail' 'DOMAIN' "$domain" '$SSL'
 fi
 
 

bin/v-backup-user

@@ -315,7 +315,7 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL" != '*' ]; then
         # Backup exim config
         if [[ "$MAIL_SYSTEM" =~ exim ]]; then
             cd $tmpdir/mail/$domain/
-            cp $HOMEDIR/$user/conf/mail/$domain/* conf/
+            cp -r $HOMEDIR/$user/conf/mail/$domain/* conf/
         fi
 
         # Backup mail.conf

bin/v-restart-service

@@ -50,6 +50,7 @@ elif [ -z "$force" -o "$force" = "no" ] && [ \
         "$service" = "fail2ban" ]; then
     systemctl reload-or-restart $service > /dev/null 2>&1
 else
+    systemctl reset-failed $service > /dev/null 2>&1
     systemctl restart $service > /dev/null 2>&1
 fi