summary refs log tree commit diff
diff options
context:
space:
mode:
authorMathieu Velten <matmaul@gmail.com>2020-12-31 00:21:03 +0100
committerMathieu Velten <matmaul@gmail.com>2020-12-31 00:21:03 +0100
commitee138d87db2c85b7417703eaa22d147cda363e35 (patch)
tree8429a922f8455f505ca77055203e71531c83e7d4
parentAdd more workers config (diff)
downloadsynapse-ee138d87db2c85b7417703eaa22d147cda363e35.tar.xz
Move client_max_body_size to server and increase to 100M
-rwxr-xr-xdocker/configure_workers_and_start.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/docker/configure_workers_and_start.py b/docker/configure_workers_and_start.py
index 232a2e62a7..0b4d2c1b0f 100755
--- a/docker/configure_workers_and_start.py
+++ b/docker/configure_workers_and_start.py
@@ -172,6 +172,11 @@ server {
     listen [::]:80;
 
     server_name localhost;
+
+    # Nginx by default only allows file uploads up to 1M in size
+    # Increase client_max_body_size to match max_upload_size defined in homeserver.yaml
+    client_max_body_size 100M;
+
     """
     nginx_config_body = ""  # to modify below
     nginx_config_template_end = """
@@ -179,13 +184,6 @@ server {
     location ~* ^(\/_matrix|\/_synapse) {
         proxy_pass http://localhost:8008;
         proxy_set_header X-Forwarded-For $remote_addr;
-
-        # TODO: Can we move this to the default nginx.conf so all locations are
-        # affected?
-        #
-        # Nginx by default only allows file uploads up to 1M in size
-        # Increase client_max_body_size to match max_upload_size defined in homeserver.yaml
-        client_max_body_size 50M;
     }
 }
 """