Skip to content
Snippets Groups Projects
Commit 9c220042c635 authored by Harrison Healey's avatar Harrison Healey
Browse files

Update Mattermost to 5.37.1 and update websocket support

MR: https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5516
Changelog: changed
parent 2fee6c0e0d5f
No related branches found
No related tags found
3 merge requests!51Validate shift of Heptapod 0.25 to oldstable series,!47Making Heptapod 0.25 the new stable in Omnibus,!45GitLab 14.2
......@@ -17,6 +17,6 @@
#
name 'mattermost'
default_version '5.36.1'
default_version '5.37.1'
source url: "https://releases.mattermost.com/#{version}/mattermost-team-#{version}-linux-amd64.tar.gz",
......@@ -21,6 +21,6 @@
source url: "https://releases.mattermost.com/#{version}/mattermost-team-#{version}-linux-amd64.tar.gz",
md5: 'f3553ba7f44948e4b07608b59f801d33'
md5: 'f8af0db00ae563a53b32466b49a20839'
relative_path 'mattermost'
......
......@@ -336,6 +336,7 @@
| 13.12 | 5.34 |
| 14.0 | 5.35 |
| 14.1 | 5.36 |
| 14.2 | 5.37 |
NOTE:
When upgrading the Mattermost version, it is essential to check the
......
......@@ -80,6 +80,49 @@
access_log <%= @log_directory %>/gitlab_mattermost_access.log gitlab_mattermost_access;
error_log <%= @log_directory %>/gitlab_mattermost_error.log;
location ~ /api/v[0-9]+/(users/)?websocket$ {
client_max_body_size <%= @client_max_body_size %>;
<% @proxy_set_headers.each do |header| %>
<% next if header[1].nil? %>
proxy_set_header <%= header[0] %> <%= header[1] %>;
<% end %>
proxy_buffers 256 16k;
proxy_buffer_size 16k;
client_body_timeout 60;
send_timeout 300;
lingering_timeout 5;
proxy_connect_timeout 90;
proxy_send_timeout 300;
proxy_read_timeout <%= @proxy_read_timeout %>;
proxy_http_version 1.1;
proxy_pass http://gitlab_mattermost;
}
location ~ /plugins/focalboard/ws/* {
client_max_body_size <%= @client_max_body_size %>;
<% @proxy_set_headers.each do |header| %>
<% next if header[1].nil? %>
proxy_set_header <%= header[0] %> <%= header[1] %>;
<% end %>
proxy_buffers 256 16k;
proxy_buffer_size 16k;
client_body_timeout 60;
send_timeout 300;
lingering_timeout 5;
proxy_connect_timeout 90;
proxy_send_timeout 300;
proxy_read_timeout <%= @proxy_read_timeout %>;
proxy_pass http://gitlab_mattermost;
}
location / {
## If you use HTTPS make sure you disable gzip compression
## to be safe against BREACH attack.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment