summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-06-21 11:47:39 +0100
committerMark Haines <mark.haines@matrix.org>2016-06-21 11:47:39 +0100
commit13e334506cf9093d2872ede95f1527c0c42d71fd (patch)
treed7b3997b2dcddbf2b2e4a0bfcac3da3379543a6e /synapse/config
parentMerge pull request #878 from matrix-org/erikj/ujson (diff)
downloadsynapse-13e334506cf9093d2872ede95f1527c0c42d71fd.tar.xz
Remove the legacy v0 content upload API.
The existing content can still be downloaded. The last upload to the
matrix.org server was in January 2015, so it is probably safe to remove
the upload API.
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/server.py20
1 files changed, 0 insertions, 20 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 7840dc3ad6..d7e6f20518 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -107,26 +107,6 @@ class ServerConfig(Config):
                 ]
             })
 
-        # Attempt to guess the content_addr for the v0 content repostitory
-        content_addr = config.get("content_addr")
-        if not content_addr:
-            for listener in self.listeners:
-                if listener["type"] == "http" and not listener.get("tls", False):
-                    unsecure_port = listener["port"]
-                    break
-            else:
-                raise RuntimeError("Could not determine 'content_addr'")
-
-            host = self.server_name
-            if ':' not in host:
-                host = "%s:%d" % (host, unsecure_port)
-            else:
-                host = host.split(':')[0]
-                host = "%s:%d" % (host, unsecure_port)
-            content_addr = "http://%s" % (host,)
-
-        self.content_addr = content_addr
-
     def default_config(self, server_name, **kwargs):
         if ":" in server_name:
             bind_port = int(server_name.split(":")[1])