diff options
| author | Erik Johnston <erik@matrix.org> | 2015-06-19 09:16:04 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-06-19 09:16:04 +0100 |
| commit | bf628cf6ddb8d955328fe811a03d3b208f940f95 (patch) | |
| tree | 042831c1ae4e96c57d606c09ece7ff502af6726b /synapse/app | |
| parent | Fix bug where synapse was sending AS user queries incorrectly. (diff) | |
| parent | Make upload dir a configurable path. (diff) | |
| download | synapse-bf628cf6ddb8d955328fe811a03d3b208f940f95.tar.xz | |
Merge pull request #191 from heavenlyhash/configurable-upload-dir
Make upload dir a configurable path.
Diffstat (limited to 'synapse/app')
| -rwxr-xr-x | synapse/app/homeserver.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 95e9122d3e..9aec23d065 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -112,7 +112,7 @@ class SynapseHomeServer(HomeServer): def build_resource_for_content_repo(self): return ContentRepoResource( - self, self.upload_dir, self.auth, self.content_addr + self, self.config.uploads_path, self.auth, self.content_addr ) def build_resource_for_media_repository(self): @@ -375,7 +375,6 @@ def setup(config_options): hs = SynapseHomeServer( config.server_name, - upload_dir=os.path.abspath("uploads"), db_config=config.database_config, tls_context_factory=tls_context_factory, config=config, |