From a630e47bfe0a0283d8ba2175273ddcc025e1d0de Mon Sep 17 00:00:00 2001
From: Fanch <fanch@kaz.bzh>
Date: Fri, 25 Jul 2025 15:10:43 +0200
Subject: [PATCH 1/7] fix mattermost pgsql

---
 bin/updateDockerPassword.sh    |  2 +-
 secret.tmpl/SetAllPass.sh      | 23 +++++++----------------
 secret.tmpl/env-mattermostDB   | 11 +++--------
 secret.tmpl/env-mattermostServ |  3 ---
 4 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/bin/updateDockerPassword.sh b/bin/updateDockerPassword.sh
index 8818f06..fb4f201 100755
--- a/bin/updateDockerPassword.sh
+++ b/bin/updateDockerPassword.sh
@@ -84,7 +84,6 @@ jirafeauUpdate(){
 updateEnvDB "etherpad" "${KAZ_KEY_DIR}/env-${etherpadDBName}" "${etherpadDBName}"
 updateEnvDB "framadate" "${KAZ_KEY_DIR}/env-${framadateDBName}" "${framadateDBName}"
 updateEnvDB "gitea" "${KAZ_KEY_DIR}/env-${gitDBName}" "${gitDBName}"
-updateEnvDB "mattermost" "${KAZ_KEY_DIR}/env-${mattermostDBName}" "${mattermostDBName}"
 updateEnvDB "nextcloud" "${KAZ_KEY_DIR}/env-${nextcloudDBName}" "${nextcloudDBName}"
 updateEnvDB "roundcube" "${KAZ_KEY_DIR}/env-${roundcubeDBName}" "${roundcubeDBName}"
 updateEnvDB "sympa" "${KAZ_KEY_DIR}/env-${sympaDBName}" "${sympaDBName}"
@@ -103,6 +102,7 @@ updateEnv "gandi" "${KAZ_KEY_DIR}/env-gandi"
 updateEnv "gitea" "${KAZ_KEY_DIR}/env-${gitServName}"
 updateEnv "jirafeau" "${KAZ_KEY_DIR}/env-${jirafeauServName}"
 updateEnv "mattermost" "${KAZ_KEY_DIR}/env-${mattermostServName}"
+updateEnv "mattermost" "${KAZ_KEY_DIR}/env-${mattermostDBName}"
 updateEnv "nextcloud" "${KAZ_KEY_DIR}/env-${nextcloudServName}"
 updateEnv "office" "${KAZ_KEY_DIR}/env-${officeServName}"
 updateEnv "roundcube" "${KAZ_KEY_DIR}/env-${roundcubeServName}"
diff --git a/secret.tmpl/SetAllPass.sh b/secret.tmpl/SetAllPass.sh
index bda9768..b16ca3e 100755
--- a/secret.tmpl/SetAllPass.sh
+++ b/secret.tmpl/SetAllPass.sh
@@ -48,26 +48,17 @@ gandi_dns_gandi_api_key="${gandi_GANDI_KEY}"
 
 ####################
 # mattermost
-mattermost_MYSQL_ROOT_PASSWORD="--clean_val--"
-mattermost_MYSQL_DATABASE="--clean_val--"
-mattermost_MYSQL_USER="--clean_val--"
-mattermost_MYSQL_PASSWORD="--clean_val--"
+mattermost_POSTGRES_USER="--clean_val--"
+mattermost_POSTGRES_PASSWORD="--clean_val--"
+mattermost_POSTGRES_DB="--clean_val--"
 
 # Share with mattermostDB
-mattermost_MM_DBNAME="${mattermost_MYSQL_DATABASE}"
-mattermost_MM_USERNAME="${mattermost_MYSQL_USER}"
-mattermost_MM_PASSWORD="${mattermost_MYSQL_PASSWORD}"
-
-mattermost_DB_PORT_NUMBER="3306"
-mattermost_DB_HOST="db"
-mattermost_MM_SQLSETTINGS_DRIVERNAME="mysql"
+mattermost_MM_DBNAME="${mattermost_POSTGRES_DB}"
+mattermost_MM_USERNAME="${mattermost_POSTGRES_USER}"
+mattermost_MM_PASSWORD="${mattermost_POSTGRES_PASSWORD}"
 mattermost_MM_ADMIN_EMAIL="admin@kaz.bzh"
 
-# mattermost_MM_SQLSETTINGS_DATASOURCE = "MM_USERNAME:MM_PASSWORD@tcp(DB_HOST:DB_PORT_NUMBER)/MM_DBNAME?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s"
-# Don't forget to replace all entries (beginning by MM_ and DB_) in MM_SQLSETTINGS_DATASOURCE with the real variables values.
-mattermost_MM_SQLSETTINGS_DATASOURCE="${mattermost_MYSQL_USER}:${mattermost_MYSQL_PASSWORD}@tcp(${mattermost_DB_HOST}:${mattermost_DB_PORT_NUMBER})/${mattermost_MM_DBNAME}?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s"
-# sinon avec postgres
-# mattermost_MM_SQLSETTINGS_DATASOURCE = "postgres://${MM_USERNAME}:${MM_PASSWORD}@db:5432/${MM_DBNAME}?sslmode=disable&connect_timeout=10"
+mattermost_MM_SQLSETTINGS_DATASOURCE="postgres://${mattermost_MM_USERNAME}:${mattermost_MM_PASSWORD}@postgres:5432/${mattermost_MM_DBNAME}?sslmode=disable&connect_timeout=10"
 
 # pour envoyer des messages sur l'agora avec mmctl
 mattermost_user="admin-mattermost"
diff --git a/secret.tmpl/env-mattermostDB b/secret.tmpl/env-mattermostDB
index 80c9b00..8b2a930 100644
--- a/secret.tmpl/env-mattermostDB
+++ b/secret.tmpl/env-mattermostDB
@@ -1,8 +1,3 @@
-
-MYSQL_ROOT_PASSWORD=
-MYSQL_DATABASE=
-MYSQL_USER=
-MYSQL_PASSWORD=
-
-MM_MYSQL_USER=
-MM_MYSQL_PASSWORD=
+POSTGRES_USER=
+POSTGRES_PASSWORD=
+POSTGRES_DB=
diff --git a/secret.tmpl/env-mattermostServ b/secret.tmpl/env-mattermostServ
index 773986a..00cc6e6 100644
--- a/secret.tmpl/env-mattermostServ
+++ b/secret.tmpl/env-mattermostServ
@@ -8,8 +8,5 @@ MM_ADMIN_EMAIL=
 MM_ADMIN_USER=
 MM_ADMIN_PASSWORD=
 
-DB_HOST=
-DB_PORT_NUMBER=
-MM_SQLSETTINGS_DRIVERNAME=
 MM_SQLSETTINGS_DATASOURCE=
 

From 19363265354ea2edabc95ee967d6a68496a964b7 Mon Sep 17 00:00:00 2001
From: Fanch <fanch@kaz.bzh>
Date: Fri, 25 Jul 2025 15:52:47 +0200
Subject: [PATCH 2/7] fix default matterport

---
 config/dockers.tmpl.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/dockers.tmpl.env b/config/dockers.tmpl.env
index 2a4cb85..6061f4e 100644
--- a/config/dockers.tmpl.env
+++ b/config/dockers.tmpl.env
@@ -101,7 +101,7 @@ snappymailHost=snappymail
 ########################################
 # ports internes
 
-matterPort=8000
+matterPort=8065
 imapsyncPort=8080
 apikaz=5000
 

From 3220d862a643bc8e63c1fdbf729d918a28aaf2cc Mon Sep 17 00:00:00 2001
From: Fanch <fanch@kaz.bzh>
Date: Sat, 26 Jul 2025 13:52:15 +0200
Subject: [PATCH 3/7] fix mattermost

---
 secret.tmpl/SetAllPass.sh      | 15 +++++----------
 secret.tmpl/env-mattermostServ | 12 +-----------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/secret.tmpl/SetAllPass.sh b/secret.tmpl/SetAllPass.sh
index b16ca3e..6045a07 100755
--- a/secret.tmpl/SetAllPass.sh
+++ b/secret.tmpl/SetAllPass.sh
@@ -48,21 +48,16 @@ gandi_dns_gandi_api_key="${gandi_GANDI_KEY}"
 
 ####################
 # mattermost
-mattermost_POSTGRES_USER="--clean_val--"
+mattermost_POSTGRES_USER="mattermost"
 mattermost_POSTGRES_PASSWORD="--clean_val--"
-mattermost_POSTGRES_DB="--clean_val--"
+mattermost_POSTGRES_DB="mattermost"
 
-# Share with mattermostDB
-mattermost_MM_DBNAME="${mattermost_POSTGRES_DB}"
-mattermost_MM_USERNAME="${mattermost_POSTGRES_USER}"
-mattermost_MM_PASSWORD="${mattermost_POSTGRES_PASSWORD}"
-mattermost_MM_ADMIN_EMAIL="admin@kaz.bzh"
-
-mattermost_MM_SQLSETTINGS_DATASOURCE="postgres://${mattermost_MM_USERNAME}:${mattermost_MM_PASSWORD}@postgres:5432/${mattermost_MM_DBNAME}?sslmode=disable&connect_timeout=10"
+mattermost_MM_ADMIN_EMAIL="${matterHost}@${domain}"
+mattermost_MM_SQLSETTINGS_DATASOURCE="postgres://${mattermost_POSTGRES_USER}:${mattermost_POSTGRES_PASSWORD}@postgres:5432/${mattermost_POSTGRES_DB}?sslmode=disable&connect_timeout=10"
 
 # pour envoyer des messages sur l'agora avec mmctl
 mattermost_user="admin-mattermost"
-mattermost_pass="--clean_val--"
+mattermost_pass="--clean_val--@"
 mattermost_token="xxx-private"
 
 ##################
diff --git a/secret.tmpl/env-mattermostServ b/secret.tmpl/env-mattermostServ
index 00cc6e6..abd9ed6 100644
--- a/secret.tmpl/env-mattermostServ
+++ b/secret.tmpl/env-mattermostServ
@@ -1,12 +1,2 @@
-
-# share with matterDB
-MM_DBNAME=
-MM_USERNAME=
-MM_PASSWORD=
-
-MM_ADMIN_EMAIL=
-MM_ADMIN_USER=
-MM_ADMIN_PASSWORD=
-
 MM_SQLSETTINGS_DATASOURCE=
-
+MM_ADMIN_EMAIL=
\ No newline at end of file

From 74812fa79a3ed3319a925a94934bc881dc1cfbad Mon Sep 17 00:00:00 2001
From: Fanch <fanch@kaz.bzh>
Date: Sat, 26 Jul 2025 14:45:27 +0200
Subject: [PATCH 4/7] mattermost admin user/pass

---
 secret.tmpl/SetAllPass.sh      | 6 ++++--
 secret.tmpl/env-mattermostServ | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/secret.tmpl/SetAllPass.sh b/secret.tmpl/SetAllPass.sh
index 6045a07..0b78368 100755
--- a/secret.tmpl/SetAllPass.sh
+++ b/secret.tmpl/SetAllPass.sh
@@ -53,11 +53,13 @@ mattermost_POSTGRES_PASSWORD="--clean_val--"
 mattermost_POSTGRES_DB="mattermost"
 
 mattermost_MM_ADMIN_EMAIL="${matterHost}@${domain}"
+mattermost_MM_ADMIN_USER="admin-mattermost"
+mattermost_MM_ADMIN_PASSWORD="--clean_val--@"
 mattermost_MM_SQLSETTINGS_DATASOURCE="postgres://${mattermost_POSTGRES_USER}:${mattermost_POSTGRES_PASSWORD}@postgres:5432/${mattermost_POSTGRES_DB}?sslmode=disable&connect_timeout=10"
 
 # pour envoyer des messages sur l'agora avec mmctl
-mattermost_user="admin-mattermost"
-mattermost_pass="--clean_val--@"
+mattermost_user="${mattermost_MM_ADMIN_USER}"
+mattermost_pass="${mattermost_MM_ADMIN_PASSWORD}"
 mattermost_token="xxx-private"
 
 ##################
diff --git a/secret.tmpl/env-mattermostServ b/secret.tmpl/env-mattermostServ
index abd9ed6..8db419b 100644
--- a/secret.tmpl/env-mattermostServ
+++ b/secret.tmpl/env-mattermostServ
@@ -1,2 +1,4 @@
 MM_SQLSETTINGS_DATASOURCE=
-MM_ADMIN_EMAIL=
\ No newline at end of file
+MM_ADMIN_EMAIL=
+MM_ADMIN_USER=
+MM_ADMIN_PASSWORD=
\ No newline at end of file

From fc4adc0faef9ff0f4ba13dff9defbefc8ebc8961 Mon Sep 17 00:00:00 2001
From: Fanch <fanch@kaz.bzh>
Date: Sat, 26 Jul 2025 15:32:54 +0200
Subject: [PATCH 5/7] mattermost first launch

---
 dockers/mattermost/first.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dockers/mattermost/first.sh b/dockers/mattermost/first.sh
index 46b81be..5058205 100755
--- a/dockers/mattermost/first.sh
+++ b/dockers/mattermost/first.sh
@@ -11,3 +11,6 @@ cd $(dirname $0)
 "${KAZ_BIN_DIR}/gestContainers.sh" --install -M -agora
 
 
+docker exec ${mattermostServName} mmctl auth login https://${matterHost}.{$domain} --name local-server --username ${mattermost_MM_ADMIN_USER} --password ${mattermost_MM_ADMIN_PASSWORD}
+docker exec ${mattermostServName} mmctl channel create --team kaz --name "une-question--un-soucis" --display-name "Une question ? Un souci ?"
+docker exec ${mattermostServName} mmctl channel create --team kaz --name "cafe-du-commerce--ouvert-2424h" --display-name "Café du commerce"
\ No newline at end of file

From 2e62e9782e83b4245ac76dc9db17c6620a80b20a Mon Sep 17 00:00:00 2001
From: Fanch <fanch@kaz.bzh>
Date: Sat, 26 Jul 2025 15:40:15 +0200
Subject: [PATCH 6/7] mattermost canal creation comptes

---
 dockers/mattermost/first.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dockers/mattermost/first.sh b/dockers/mattermost/first.sh
index 5058205..7e2b6e9 100755
--- a/dockers/mattermost/first.sh
+++ b/dockers/mattermost/first.sh
@@ -13,4 +13,5 @@ cd $(dirname $0)
 
 docker exec ${mattermostServName} mmctl auth login https://${matterHost}.{$domain} --name local-server --username ${mattermost_MM_ADMIN_USER} --password ${mattermost_MM_ADMIN_PASSWORD}
 docker exec ${mattermostServName} mmctl channel create --team kaz --name "une-question--un-soucis" --display-name "Une question ? Un souci ?"
-docker exec ${mattermostServName} mmctl channel create --team kaz --name "cafe-du-commerce--ouvert-2424h" --display-name "Café du commerce"
\ No newline at end of file
+docker exec ${mattermostServName} mmctl channel create --team kaz --name "cafe-du-commerce--ouvert-2424h" --display-name "Café du commerce"
+docker exec ${mattermostServName} mmctl channel create --team kaz --name "creation-comptes" --display-name "Création comptes"

From 813e0e761f52a7b2de0768578aa7740a02a08470 Mon Sep 17 00:00:00 2001
From: Fanch <fanch@kaz.bzh>
Date: Sat, 26 Jul 2025 15:41:38 +0200
Subject: [PATCH 7/7] typo

---
 dockers/mattermost/first.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/mattermost/first.sh b/dockers/mattermost/first.sh
index 7e2b6e9..b9c79fb 100755
--- a/dockers/mattermost/first.sh
+++ b/dockers/mattermost/first.sh
@@ -11,7 +11,7 @@ cd $(dirname $0)
 "${KAZ_BIN_DIR}/gestContainers.sh" --install -M -agora
 
 
-docker exec ${mattermostServName} mmctl auth login https://${matterHost}.{$domain} --name local-server --username ${mattermost_MM_ADMIN_USER} --password ${mattermost_MM_ADMIN_PASSWORD}
+docker exec ${mattermostServName} mmctl auth login https://${matterHost}.${domain} --name local-server --username ${mattermost_MM_ADMIN_USER} --password ${mattermost_MM_ADMIN_PASSWORD}
 docker exec ${mattermostServName} mmctl channel create --team kaz --name "une-question--un-soucis" --display-name "Une question ? Un souci ?"
 docker exec ${mattermostServName} mmctl channel create --team kaz --name "cafe-du-commerce--ouvert-2424h" --display-name "Café du commerce"
 docker exec ${mattermostServName} mmctl channel create --team kaz --name "creation-comptes" --display-name "Création comptes"