diff --git a/bin/gestUsers.sh b/bin/gestUsers.sh index fbeda1d..ff8c9c0 100755 --- a/bin/gestUsers.sh +++ b/bin/gestUsers.sh @@ -1,5 +1,7 @@ #!/bin/bash # gestion des utilisateurs de kaz ( mail, cloud général, mattermost ) +# Ki : Did +# koi : gestion globale des users Kaz mais aussi les users d'autres domaines hébergés KAZ_ROOT=$(cd "$(dirname $0)"/..; pwd) . $KAZ_ROOT/bin/.commonFunctions.sh @@ -8,7 +10,7 @@ setKazVars . $DOCKERS_ENV . $KAZ_ROOT/secret/SetAllPass.sh -VERSION="5-12-2024" +VERSION="18-05-2025" PRG=$(basename $0) RACINE=$(echo $PRG | awk '{print $1}') IFS=' ' @@ -968,9 +970,9 @@ updateUser() { MAILALIAS_CHANGE=0 for VALMAIL in ${CONTENU_ATTRIBUT} do - read -p " - On garde ${VALMAIL} (o/n) ? [o] : " READVALMAIL + read -p " - On garde ${VALMAIL} (o/n) [o] ? : " READVALMAIL case ${READVALMAIL} in - * | "" | o | O ) + "" | o | O ) NEW_CONTENU_ATTRIBUT="${NEW_CONTENU_ATTRIBUT} ${VALMAIL}" ;; n | N ) @@ -1007,7 +1009,7 @@ updateUser() { done ;; "" | n | N ) - #CHANGED+=([mailAlias]="${NEW_CONTENU_ATTRIBUT}") + CHANGED+=([mailAlias]="${NEW_CONTENU_ATTRIBUT}") ;; * ) printKazMsg "Erreur" diff --git a/dockers/roundcube/docker-compose.yml b/dockers/roundcube/docker-compose.yml index 3034dce..0df039e 100644 --- a/dockers/roundcube/docker-compose.yml +++ b/dockers/roundcube/docker-compose.yml @@ -26,7 +26,7 @@ services: - ../../secret/env-${roundcubeServName} labels: - "traefik.enable=true" - - "traefik.http.routers.${roundcubeServName}.rule=Host(`${webmailHost}.${domain}`) || host(`roundcube.${domain}`)" + - "traefik.http.routers.${roundcubeServName}.rule=host(`roundcube.${domain}`)" - "traefik.docker.network=roundcubeNet" db: