diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-11 17:48:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-11 17:48:48 +0000 |
| commit | cde840a82c9397f9f880102520d0193462efc13f (patch) | |
| tree | 7e875e0514fd8db28244ba813927d293c4cb7929 /synapse/config/repository.py | |
| parent | Fix replication tests (diff) | |
| parent | Merge pull request #23 from matrix-org/media_repository (diff) | |
| download | synapse-cde840a82c9397f9f880102520d0193462efc13f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Conflicts: setup.py
Diffstat (limited to 'synapse/config/repository.py')
| -rw-r--r-- | synapse/config/repository.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 743bc26474..f1b7b1b74e 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -20,6 +20,8 @@ class ContentRepositoryConfig(Config): def __init__(self, args): super(ContentRepositoryConfig, self).__init__(args) self.max_upload_size = self.parse_size(args.max_upload_size) + self.max_image_pixels = self.parse_size(args.max_image_pixels) + self.media_store_path = self.ensure_directory(args.media_store_path) def parse_size(self, string): sizes = {"K": 1024, "M": 1024 * 1024} @@ -37,3 +39,10 @@ class ContentRepositoryConfig(Config): db_group.add_argument( "--max-upload-size", default="1M" ) + db_group.add_argument( + "--media-store-path", default=cls.default_path("media_store") + ) + db_group.add_argument( + "--max-image-pixels", default="32M", + help="Maximum number of pixels that will be thumbnailed" + ) |