From ad0d4208c9d2917c604e269b7e62cf338a0fedd1 Mon Sep 17 00:00:00 2001 From: Boris Gallet Date: Tue, 12 Nov 2024 16:04:30 +0100 Subject: [PATCH] chg: [mattermost] upd img to 5.30.1 and add DATASOURCE to connect db --- mattermost/hooks/postgres_database-relation-joined | 7 +++++-- mattermost/metadata.yml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mattermost/hooks/postgres_database-relation-joined b/mattermost/hooks/postgres_database-relation-joined index de1b7d3..c13b76a 100755 --- a/mattermost/hooks/postgres_database-relation-joined +++ b/mattermost/hooks/postgres_database-relation-joined @@ -20,12 +20,15 @@ services: MM_PASSWORD: $PASSWORD MM_USERNAME: $USER " +DATASOURCE="postgres://${USER}:${PASSWORD}@${HOST}:${PORT}/${DBNAME}?sslmode=disable\&connect_timeout=10" + if [ -e "$SERVICE_CONFIGSTORE/mattermost/config/config.json" ]; then - sed -ri 's/(^\s+"DataSource": "postgres:[^:]+:)([^@]+)@/\1'"$PASSWORD"'@/' \ - "$SERVICE_CONFIGSTORE/mattermost/config/config.json" || exit 1 + sed -ri 's|("DataSource": ")[^"]*(")|\1'"$DATASOURCE"'\2|' \ + "$SERVICE_CONFIGSTORE/mattermost/config/config.json" || exit 1 fi + [ "$control" == "$(relation-get control 2>/dev/null)" ] && exit 0 diff --git a/mattermost/metadata.yml b/mattermost/metadata.yml index c0d0f47..c57b467 100644 --- a/mattermost/metadata.yml +++ b/mattermost/metadata.yml @@ -38,4 +38,4 @@ uses: RewriteCond %{REQUEST_URI} /api/v[0-9]+/(users/)?websocket [NC,OR] RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC,OR] RewriteCond %{HTTP:CONNECTION} ^Upgrade$ [NC] - RewriteRule .* ws://${MASTER_BASE_SERVICE_NAME}:8000%{REQUEST_URI} [P,QSA,L] + RewriteRule .* ws://${MASTER_BASE_SERVICE_NAME}:8065%{REQUEST_URI} [P,QSA,L]