Merge branch 'next' into 'next'

update example configurations in DEPLOY.md for Apache and Nginx which include...

See merge request famedly/conduit!493
This commit is contained in:
Timo Kösters 2023-07-02 20:20:31 +00:00
commit f0a27dcb00

View file

@ -224,7 +224,7 @@ Listen 8448
ServerName your.server.name # EDIT THIS ServerName your.server.name # EDIT THIS
AllowEncodedSlashes NoDecode AllowEncodedSlashes NoDecode
ProxyPass /_matrix/ http://127.0.0.1:6167/_matrix/ nocanon ProxyPass /_matrix/ http://127.0.0.1:6167/_matrix/ timeout=300 nocanon
ProxyPassReverse /_matrix/ http://127.0.0.1:6167/_matrix/ ProxyPassReverse /_matrix/ http://127.0.0.1:6167/_matrix/
</VirtualHost> </VirtualHost>
@ -270,12 +270,14 @@ server {
merge_slashes off; merge_slashes off;
# Nginx defaults to only allow 1MB uploads # Nginx defaults to only allow 1MB uploads
# Increase this to allow posting large files such as videos
client_max_body_size 20M; client_max_body_size 20M;
location /_matrix/ { location /_matrix/ {
proxy_pass http://127.0.0.1:6167$request_uri; proxy_pass http://127.0.0.1:6167$request_uri;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
proxy_buffering off; proxy_buffering off;
proxy_read_timeout 5m;
} }
ssl_certificate /etc/letsencrypt/live/your.server.name/fullchain.pem; # EDIT THIS ssl_certificate /etc/letsencrypt/live/your.server.name/fullchain.pem; # EDIT THIS