diff options
| author | Erik Johnston <erik@matrix.org> | 2018-09-19 15:08:36 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-09-19 15:08:36 +0100 |
| commit | ce846bb620e9866531f4a49f183fdd3cbb3f1eeb (patch) | |
| tree | ed38561118af50948598967e17ad6a7f1fee8a8c /docker/conf/homeserver.yaml | |
| parent | Newsfile (diff) | |
| parent | Merge pull request #3910 from matrix-org/erikj/update_timeout (diff) | |
| download | synapse-ce846bb620e9866531f4a49f183fdd3cbb3f1eeb.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typing
Diffstat (limited to 'docker/conf/homeserver.yaml')
| -rw-r--r-- | docker/conf/homeserver.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
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 |