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

The roundcube password plugin is not disabled.

# Conflicts:
#	management/utils.py
#	setup/start.sh
#	setup/system.sh
#	setup/webmail.sh
#	tools/editconf.py

tests/system-setup/setup-funcs.sh

@@ -397,7 +397,7 @@ miab_ldap_install() {
         need_pop="yes"
     fi
     
-    H1 "MIAB-LDAP INSTALL [$(git describe 2>/dev/null)]"
+    H1 "MIAB-LDAP INSTALL [$(pwd)] [$(git describe 2>/dev/null)]"
     # ensure we're in a MiaB-LDAP working directory
     if [ ! -e setup/ldap.sh ]; then
         die "Cannot install: the working directory is not MiaB-LDAP!"
@@ -448,7 +448,7 @@ miab_ldap_install() {
     populate_by_cli_argument "$@"
     capture_state_by_cli_argument "$@"
     
-    if [ "need_pop" = "yes" ]; then
+    if [ "$need_pop" = "yes" ]; then
         popd >/dev/null
     fi
 }

tests/system-setup/upgrade.sh

@@ -66,7 +66,6 @@ popd >/dev/null
 
 # install master miab-ldap and capture state
 H2 "New miabldap"
-echo "git branch: $(git branch | grep '*')"
 miab_ldap_install --capture-state="/tmp/state/master"
 
 # compare states