diff options
| author | Erik Johnston <erik@matrix.org> | 2015-07-01 15:12:57 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-07-01 15:12:57 +0100 |
| commit | 67362a9a034a9a8945c10faf78e9b13598e3dc9e (patch) | |
| tree | c523d50061b18df57d33397dfdfb586fd267bbdd /synapse/config/repository.py | |
| parent | clarify readme a bit more (diff) | |
| parent | Bump changelog and version to v0.9.3 (diff) | |
| download | synapse-9cb986de8f60183bba0e5dc08be421b03ae0babd.tar.xz | |
Merge branch 'release-v0.9.3' of github.com:matrix-org/synapse v0.9.3
Diffstat (limited to 'synapse/config/repository.py')
| -rw-r--r-- | synapse/config/repository.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/config/repository.py b/synapse/config/repository.py index adaf4e4bb2..6891abd71d 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -21,13 +21,18 @@ class ContentRepositoryConfig(Config): self.max_upload_size = self.parse_size(config["max_upload_size"]) self.max_image_pixels = self.parse_size(config["max_image_pixels"]) self.media_store_path = self.ensure_directory(config["media_store_path"]) + self.uploads_path = self.ensure_directory(config["uploads_path"]) def default_config(self, config_dir_path, server_name): media_store = self.default_path("media_store") + uploads_path = self.default_path("uploads") return """ # Directory where uploaded images and attachments are stored. media_store_path: "%(media_store)s" + # Directory where in-progress uploads are stored. + uploads_path: "%(uploads_path)s" + # The largest allowed upload size in bytes max_upload_size: "10M" |