summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-06-19 09:16:04 +0100
committerErik Johnston <erik@matrix.org>2015-06-19 09:16:04 +0100
commitbf628cf6ddb8d955328fe811a03d3b208f940f95 (patch)
tree042831c1ae4e96c57d606c09ece7ff502af6726b /synapse/app
parentFix bug where synapse was sending AS user queries incorrectly. (diff)
parentMake upload dir a configurable path. (diff)
downloadsynapse-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-xsynapse/app/homeserver.py3
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,