diff options
| author | David Baker <dave@matrix.org> | 2014-12-18 15:15:22 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2014-12-18 15:15:22 +0000 |
| commit | b56730bb6e549e6b22c95858cae50e091de96844 (patch) | |
| tree | 0eb011bc6b32a44df8c343ffedbc15e2ddd046e9 /synapse/config/repository.py | |
| parent | schema version is now 10 (diff) | |
| parent | Update README.rst (diff) | |
| download | synapse-b56730bb6e549e6b22c95858cae50e091de96844.tar.xz | |
Merge branch 'develop' into pushers
Conflicts: synapse/api/errors.py synapse/server.py synapse/storage/__init__.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" + ) |