fix mattermost pgsql

This commit is contained in:
2025-07-25 15:10:43 +02:00
parent 33fc237cb8
commit a630e47bfe
4 changed files with 11 additions and 28 deletions

View File

@@ -84,7 +84,6 @@ jirafeauUpdate(){
updateEnvDB "etherpad" "${KAZ_KEY_DIR}/env-${etherpadDBName}" "${etherpadDBName}" updateEnvDB "etherpad" "${KAZ_KEY_DIR}/env-${etherpadDBName}" "${etherpadDBName}"
updateEnvDB "framadate" "${KAZ_KEY_DIR}/env-${framadateDBName}" "${framadateDBName}" updateEnvDB "framadate" "${KAZ_KEY_DIR}/env-${framadateDBName}" "${framadateDBName}"
updateEnvDB "gitea" "${KAZ_KEY_DIR}/env-${gitDBName}" "${gitDBName}" 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 "nextcloud" "${KAZ_KEY_DIR}/env-${nextcloudDBName}" "${nextcloudDBName}"
updateEnvDB "roundcube" "${KAZ_KEY_DIR}/env-${roundcubeDBName}" "${roundcubeDBName}" updateEnvDB "roundcube" "${KAZ_KEY_DIR}/env-${roundcubeDBName}" "${roundcubeDBName}"
updateEnvDB "sympa" "${KAZ_KEY_DIR}/env-${sympaDBName}" "${sympaDBName}" 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 "gitea" "${KAZ_KEY_DIR}/env-${gitServName}"
updateEnv "jirafeau" "${KAZ_KEY_DIR}/env-${jirafeauServName}" updateEnv "jirafeau" "${KAZ_KEY_DIR}/env-${jirafeauServName}"
updateEnv "mattermost" "${KAZ_KEY_DIR}/env-${mattermostServName}" updateEnv "mattermost" "${KAZ_KEY_DIR}/env-${mattermostServName}"
updateEnv "mattermost" "${KAZ_KEY_DIR}/env-${mattermostDBName}"
updateEnv "nextcloud" "${KAZ_KEY_DIR}/env-${nextcloudServName}" updateEnv "nextcloud" "${KAZ_KEY_DIR}/env-${nextcloudServName}"
updateEnv "office" "${KAZ_KEY_DIR}/env-${officeServName}" updateEnv "office" "${KAZ_KEY_DIR}/env-${officeServName}"
updateEnv "roundcube" "${KAZ_KEY_DIR}/env-${roundcubeServName}" updateEnv "roundcube" "${KAZ_KEY_DIR}/env-${roundcubeServName}"

View File

@@ -48,26 +48,17 @@ gandi_dns_gandi_api_key="${gandi_GANDI_KEY}"
#################### ####################
# mattermost # mattermost
mattermost_MYSQL_ROOT_PASSWORD="--clean_val--" mattermost_POSTGRES_USER="--clean_val--"
mattermost_MYSQL_DATABASE="--clean_val--" mattermost_POSTGRES_PASSWORD="--clean_val--"
mattermost_MYSQL_USER="--clean_val--" mattermost_POSTGRES_DB="--clean_val--"
mattermost_MYSQL_PASSWORD="--clean_val--"
# Share with mattermostDB # Share with mattermostDB
mattermost_MM_DBNAME="${mattermost_MYSQL_DATABASE}" mattermost_MM_DBNAME="${mattermost_POSTGRES_DB}"
mattermost_MM_USERNAME="${mattermost_MYSQL_USER}" mattermost_MM_USERNAME="${mattermost_POSTGRES_USER}"
mattermost_MM_PASSWORD="${mattermost_MYSQL_PASSWORD}" mattermost_MM_PASSWORD="${mattermost_POSTGRES_PASSWORD}"
mattermost_DB_PORT_NUMBER="3306"
mattermost_DB_HOST="db"
mattermost_MM_SQLSETTINGS_DRIVERNAME="mysql"
mattermost_MM_ADMIN_EMAIL="admin@kaz.bzh" 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" mattermost_MM_SQLSETTINGS_DATASOURCE="postgres://${mattermost_MM_USERNAME}:${mattermost_MM_PASSWORD}@postgres:5432/${mattermost_MM_DBNAME}?sslmode=disable&connect_timeout=10"
# 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"
# pour envoyer des messages sur l'agora avec mmctl # pour envoyer des messages sur l'agora avec mmctl
mattermost_user="admin-mattermost" mattermost_user="admin-mattermost"

View File

@@ -1,8 +1,3 @@
POSTGRES_USER=
MYSQL_ROOT_PASSWORD= POSTGRES_PASSWORD=
MYSQL_DATABASE= POSTGRES_DB=
MYSQL_USER=
MYSQL_PASSWORD=
MM_MYSQL_USER=
MM_MYSQL_PASSWORD=

View File

@@ -8,8 +8,5 @@ MM_ADMIN_EMAIL=
MM_ADMIN_USER= MM_ADMIN_USER=
MM_ADMIN_PASSWORD= MM_ADMIN_PASSWORD=
DB_HOST=
DB_PORT_NUMBER=
MM_SQLSETTINGS_DRIVERNAME=
MM_SQLSETTINGS_DATASOURCE= MM_SQLSETTINGS_DATASOURCE=