diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-12-11 18:35:05 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-12-11 18:35:05 +0000 |
| commit | 0b700233737adfa3c6558e988822e7f9ee31ca39 (patch) | |
| tree | eac8aff9fb9f58da245c9c3e7a80fa13ac5e1eb1 /synapse/config/repository.py | |
| parent | Merge remote-tracking branch 'origin' into typing_notifications (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-0b700233737adfa3c6558e988822e7f9ee31ca39.tar.xz | |
Merge branch 'develop' into typing_notifications
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" + ) |