Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox

Upstream is adding handling for utf8 domains by creating a domain alias @utf8 -> @idna. I'm deviating from this approach by setting multiple email address (idna and utf8) per user and alias where a domain contains non-ascii characters. The maildrop (mailbox) remains the same - all mail goes to the user's mailbox regardless of which email address was used. This is more in line with how other systems (eg. active directory), handle multiple email addresses for a single user.

# Conflicts:
#	README.md
#	management/mailconfig.py
#	management/templates/index.html
#	setup/dns.sh
#	setup/mail-users.sh

tests/vagrant/Vagrantfile

@@ -49,6 +49,23 @@ tests/runner.sh upgrade-basic upgrade-totpuser default || exit 2
 SH
   end
 
+  # upgrade
+  
+  # this test is only needed when testing migrations from miabldap
+  # to a newer miabldap with a migration step
+  #
+  # upgrade will handle testing upgrades of
+  # miabldap with or without a new migration step
+  config.vm.define "upgrade" do |m1|
+    m1.vm.provision :shell, :inline => <<-SH
+cd /mailinabox
+source tests/vagrant/globals.sh || exit 1
+export PRIMARY_HOSTNAME=upgrade.abc.com
+tests/system-setup/upgrade.sh basic totpuser || exit 1
+tests/runner.sh upgrade-basic upgrade-totpuser default || exit 2
+SH
+  end
+
   # unsetvars: because miab sets bash '-e' to fail any setup script
   # when a script command returns a non-zero exit code, and more
   # importantly '-u' which fails scripts when any unset variable is