summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-09-28 18:46:50 +0100
committerErik Johnston <erik@matrix.org>2015-09-28 18:46:50 +0100
commit97b494a65574d7210fe7d641ebdb22761e1f06e5 (patch)
tree858837eead77891e89941652898e13dd99c49336
parentAdd missing file (diff)
downloadsynapse-97b494a65574d7210fe7d641ebdb22761e1f06e5.tar.xz
Don't enable client_addr by default
-rw-r--r--synapse/config/server.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 0b1b2fbc9d..5507e7bdd2 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -119,7 +119,7 @@ class ServerConfig(Config):
 
         client_addr = config.get("client_addr")
         if not client_addr:
-            client_addr = content_addr
+            client_addr = self.content_addr
         self.client_addr = client_addr
 
     def default_config(self, server_name, **kwargs):
@@ -146,7 +146,7 @@ class ServerConfig(Config):
         web_client: True
 
         # URL clients can use to talk to the server.
-        client_addr: "https://%(server_name)s:%(bind_port)s"
+        # client_addr: "https://%(server_name)s:%(bind_port)s"
 
         # Set the soft limit on the number of file descriptors synapse can use
         # Zero is used to indicate synapse should set the soft limit to the