From 9de98c4021bf88d8e147e1b6d94a4d902868c4d5 Mon Sep 17 00:00:00 2001
From: didier <didier@kaz.bzh>
Date: Fri, 18 Apr 2025 15:16:55 +0200
Subject: [PATCH 1/2] correction bug des alias
---
bin/gestUsers.sh | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
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"
From 1f8520db90bf6c864396955f0542ebcb088ef163 Mon Sep 17 00:00:00 2001
From: didier denoual <didier@kaz.bzh>
Date: Sat, 19 Apr 2025 13:49:22 +0200
Subject: [PATCH 2/2] webmail
---
dockers/roundcube/docker-compose.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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: