From 8eb3ab0e3854f5da76a9ec35a1f609deecc9c41d Mon Sep 17 00:00:00 2001 From: nutra-bot Date: Mon, 25 Jul 2022 14:42:50 +0000 Subject: [PATCH] Revert "it doesnt work split like this" This reverts commit 98966fcf34f32a16d27d4e0c676e1b96a9d6f1a2. --- etc/nginx/sites-available/default | 41 +++++++++++++++++++++++++++++- etc/nginx/sites-enabled/mattermost | 1 - 2 files changed, 40 insertions(+), 2 deletions(-) delete mode 120000 etc/nginx/sites-enabled/mattermost diff --git a/etc/nginx/sites-available/default b/etc/nginx/sites-available/default index 4acf5c8..fa5b2ab 100644 --- a/etc/nginx/sites-available/default +++ b/etc/nginx/sites-available/default @@ -43,9 +43,48 @@ server { # Mattermost # location /chat/ { - # This is controlled in the mattermost config in /etc/nginx/sites-available # } + location ~ /chat/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 X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Frame-Options SAMEORIGIN; + 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 90s; + proxy_http_version 1.1; + proxy_pass http://127.0.0.1:8065; + } + + location /chat/ { + client_max_body_size 50M; + proxy_set_header Connection ""; + proxy_set_header Host $http_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; + proxy_set_header X-Frame-Options SAMEORIGIN; + proxy_buffers 256 16k; + proxy_buffer_size 16k; + proxy_read_timeout 600s; + # proxy_cache mattermost_cache; + proxy_cache_revalidate on; + proxy_cache_min_uses 2; + proxy_cache_use_stale timeout; + proxy_cache_lock on; + proxy_http_version 1.1; + proxy_pass http://127.0.0.1:8065; + } # default favicon location = /favicon.ico { diff --git a/etc/nginx/sites-enabled/mattermost b/etc/nginx/sites-enabled/mattermost deleted file mode 120000 index cfe1edf..0000000 --- a/etc/nginx/sites-enabled/mattermost +++ /dev/null @@ -1 +0,0 @@ -/etc/nginx/sites-available/mattermost \ No newline at end of file -- 2.52.0