From a67ddf1fca7707c97048e9f21ebf70afec407bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 28 Jul 2023 07:33:53 +0100 Subject: [PATCH] Testing (#420) * scripts: reduce pgloader's prefetched columns This helps fixing stack overflow errors on large databases. * scripts: increase the migration timeout again It seems to be too short on some lesser-powered VMs. * Update manifest.json * Auto-update README * [autopatch] Fix Host and X-Forwarded-For header spoofing --------- Co-authored-by: Pierre de La Morinerie Co-authored-by: yunohost-bot Co-authored-by: tituspijean --- README.md | 2 +- README_fr.md | 2 +- conf/nginx.conf | 4 ++-- manifest.json | 2 +- scripts/_common.sh | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 114c7b6..4b1c004 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ To explore the benefits of Mattermost’s enterprise features, you can replace t - New features and improvements released regularly -**Shipped version:** 7.8.1~ynh1 +**Shipped version:** 7.8.1~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 0ac17f8..166245c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -36,7 +36,7 @@ Pour explorer les avantages des fonctionnalités d'entreprise de Mattermost, vou - Nouvelles fonctionnalités et améliorations publiées régulièrement -**Version incluse :** 7.8.1~ynh1 +**Version incluse :** 7.8.1~ynh2 ## Captures d’écran diff --git a/conf/nginx.conf b/conf/nginx.conf index 312a59d..9e32209 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,7 +4,7 @@ location ~ __PATH__/api/v[0-9]+/(users/)?websocket$ { proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; client_max_body_size 50M; - proxy_set_header Host $http_host; + proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; @@ -18,7 +18,7 @@ location ~ __PATH__/api/v[0-9]+/(users/)?websocket$ { location __PATH__/ { client_max_body_size 50M; proxy_set_header Connection ""; - proxy_set_header Host $http_host; + proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; diff --git a/manifest.json b/manifest.json index e6f0ea8..2967fba 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source collaboration platform built for developers", "fr": "Plateforme de collaboration open source conçue pour les développeurs" }, - "version": "7.8.1~ynh1", + "version": "7.8.1~ynh2", "url": "http://www.mattermost.org/", "upstream": { "license": "GPL-3.0-only", diff --git a/scripts/_common.sh b/scripts/_common.sh index e762d7b..dce1e80 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -35,7 +35,7 @@ mariadb-to-pg() { pushd $final_path ynh_systemd_action --service_name="$app" --action="stop" set +e - sudo -u mattermost timeout --preserve-status 180 "./bin/mattermost" + sudo -u mattermost timeout --preserve-status 300 "./bin/mattermost" if [ "$?" != "0" ] && [ "$?" != "143" ] ; then ynh_die --message="Failed to run Mattermost to create PostgreSQL database tables" --ret_code=1 fi @@ -67,7 +67,7 @@ LOAD DATABASE WITH include no drop, truncate, create no tables, create no indexes, preserve index names, no foreign keys, - data only, workers = 16, concurrency = 1 + data only, workers = 16, concurrency = 1, prefetch rows = 10000 SET MySQL PARAMETERS net_read_timeout = '90',