summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-18 17:18:39 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-18 17:18:54 +0100
commit58548ab557bbbdd95644997e00777b0aec8532bc (patch)
treeee70e07d5ef30fd651637a1d41ec856f1cdb28ba /synapse/app/homeserver.py
parenths: Make the uploads directory if it doesn't exist. Namespace uploads by the ... (diff)
downloadsynapse-58548ab557bbbdd95644997e00777b0aec8532bc.tar.xz
Implemented GETs for the ContentRepoResource. It all actually appears to be working.
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-xsynapse/app/homeserver.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index f7c1da9201..ca102236cf 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -24,7 +24,7 @@ from twisted.python.log import PythonLoggingObserver
 from twisted.web.resource import Resource
 from twisted.web.static import File
 from twisted.web.server import Site
-from synapse.http.server import JsonResource, RootRedirect, FileUploadResource
+from synapse.http.server import JsonResource, RootRedirect, ContentRepoResource
 from synapse.http.client import TwistedHttpClient
 from synapse.api.urls import (
     CLIENT_PREFIX, FEDERATION_PREFIX, WEB_CLIENT_PREFIX, CONTENT_REPO_PREFIX
@@ -56,7 +56,7 @@ class SynapseHomeServer(HomeServer):
         return File("webclient")  # TODO configurable?
 
     def build_resource_for_content_repo(self):
-        return FileUploadResource("uploads", self.auth)
+        return ContentRepoResource("uploads", self.auth)
 
     def build_db_pool(self):
         """ Set up all the dbs. Since all the *.sql have IF NOT EXISTS, so we