From dc50197a13e2d66608f1ee121b7db34a964031dd Mon Sep 17 00:00:00 2001 From: Jacob Taylor Date: Thu, 29 Jun 2023 02:42:32 +0000 Subject: [PATCH 1/2] update example configurations in DEPLOY.md for Apache and Nginx which include upstream proxy timeouts of 5 minutes to allow for room joins which take a while --- DEPLOY.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/DEPLOY.md b/DEPLOY.md index 75db3664..8a6e48aa 100644 --- a/DEPLOY.md +++ b/DEPLOY.md @@ -224,7 +224,8 @@ Listen 8448 ServerName your.server.name # EDIT THIS AllowEncodedSlashes NoDecode -ProxyPass /_matrix/ http://127.0.0.1:6167/_matrix/ nocanon +# joining large rooms can be slow. increase timeout to 600 if you still have issues. +ProxyPass /_matrix/ http://127.0.0.1:6167/_matrix/ timeout=300 nocanon ProxyPassReverse /_matrix/ http://127.0.0.1:6167/_matrix/ @@ -270,12 +271,15 @@ server { merge_slashes off; # Nginx defaults to only allow 1MB uploads + # Increase this to allow posting large files such as videos client_max_body_size 20M; location /_matrix/ { proxy_pass http://127.0.0.1:6167$request_uri; proxy_set_header Host $http_host; proxy_buffering off; + # joining large rooms can be slow. increase to 10m if you still have issues. + proxy_read_timeout 5m; } ssl_certificate /etc/letsencrypt/live/your.server.name/fullchain.pem; # EDIT THIS From 2640f67e4b6373c6db0032cdc3786d07d14e4309 Mon Sep 17 00:00:00 2001 From: Jacob Taylor Date: Sun, 2 Jul 2023 18:00:30 +0000 Subject: [PATCH 2/2] remove comments --- DEPLOY.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/DEPLOY.md b/DEPLOY.md index 8a6e48aa..e5e1530c 100644 --- a/DEPLOY.md +++ b/DEPLOY.md @@ -224,7 +224,6 @@ Listen 8448 ServerName your.server.name # EDIT THIS AllowEncodedSlashes NoDecode -# joining large rooms can be slow. increase timeout to 600 if you still have issues. ProxyPass /_matrix/ http://127.0.0.1:6167/_matrix/ timeout=300 nocanon ProxyPassReverse /_matrix/ http://127.0.0.1:6167/_matrix/ @@ -278,7 +277,6 @@ server { proxy_pass http://127.0.0.1:6167$request_uri; proxy_set_header Host $http_host; proxy_buffering off; - # joining large rooms can be slow. increase to 10m if you still have issues. proxy_read_timeout 5m; }