diff options
| author | Eric Myhre <hash@exultant.us> | 2015-06-18 23:38:20 -0500 |
|---|---|---|
| committer | Eric Myhre <hash@exultant.us> | 2015-06-18 23:38:20 -0500 |
| commit | 9e5a353663c111cfe34b727f75eed3616201ef72 (patch) | |
| tree | 042831c1ae4e96c57d606c09ece7ff502af6726b /synapse/app | |
| parent | Fix bug where synapse was sending AS user queries incorrectly. (diff) | |
| download | synapse-9e5a353663c111cfe34b727f75eed3616201ef72.tar.xz | |
Make upload dir a configurable path.
Fixes SYN-425. Signed-off-by: Eric Myhre <hash@exultant.us>
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, |