summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-09-18 13:05:09 +0100
committerGitHub <noreply@github.com>2018-09-18 13:05:09 +0100
commit892432c81852c57c1af122eb241ff2e200d7d58c (patch)
treed96831461364c3a20c7f4b6302d709620bf3a063 /docker
parentMerge pull request #3889 from matrix-org/rav/404_on_remove_unknown_alias (diff)
parentAdding the ability to change MAX_UPLOAD_SIZE for the docker container variables. (diff)
downloadsynapse-892432c81852c57c1af122eb241ff2e200d7d58c.tar.xz
Merge pull request #3882 from SimmyD/max_upload_docker_var
Add variable for changing the max upload size in Docker container
Diffstat (limited to 'docker')
-rw-r--r--docker/README.md1
-rw-r--r--docker/conf/homeserver.yaml2
2 files changed, 2 insertions, 1 deletions
diff --git a/docker/README.md b/docker/README.md
index 038c78f7c0..3c00d1e948 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -88,6 +88,7 @@ variables are available for configuration:
 * ``SYNAPSE_TURN_URIS``, set this variable to the coma-separated list of TURN
   uris to enable TURN for this homeserver.
 * ``SYNAPSE_TURN_SECRET``, set this to the TURN shared secret if required.
+* ``SYNAPSE_MAX_UPLOAD_SIZE``, set this variable to change the max upload size [default `10M`].
 
 Shared secrets, that will be initialized to random values if not set:
 
diff --git a/docker/conf/homeserver.yaml b/docker/conf/homeserver.yaml
index 6bc25bb45f..cfe88788f2 100644
--- a/docker/conf/homeserver.yaml
+++ b/docker/conf/homeserver.yaml
@@ -85,7 +85,7 @@ federation_rc_concurrent: 3
 
 media_store_path: "/data/media"
 uploads_path: "/data/uploads"
-max_upload_size: "10M"
+max_upload_size: "{{ SYNAPSE_MAX_UPLOAD_SIZE or "10M" }}"
 max_image_pixels: "32M"
 dynamic_thumbnails: false