summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-03 11:57:23 +0100
committerErik Johnston <erik@matrix.org>2014-09-03 11:57:23 +0100
commitbc21350298ff87b5f4cebfbba669435eb4ff4e75 (patch)
tree65c4f5e0637230649c669a3ce1279e1cc3188847 /synapse/app/homeserver.py
parentUpdate port numbers. (diff)
downloadsynapse-bc21350298ff87b5f4cebfbba669435eb4ff4e75.tar.xz
Add option to change content repo location
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-xsynapse/app/homeserver.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 8a7cd07fec..fced1aa243 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -74,7 +74,9 @@ class SynapseHomeServer(HomeServer):
         return File("webclient")  # TODO configurable?
 
     def build_resource_for_content_repo(self):
-        return ContentRepoResource(self, self.upload_dir, self.auth)
+        return ContentRepoResource(
+            self, self.upload_dir, self.auth, self.content_addr
+        )
 
     def build_db_pool(self):
         """ Set up all the dbs. Since all the *.sql have IF NOT EXISTS, so we
@@ -248,6 +250,7 @@ def setup():
         db_name=config.database_path,
         tls_context_factory=tls_context_factory,
         config=config,
+        content_addr=config.content_addr,
     )
 
     hs.register_servlets()