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] 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=