From 7993e3d10dd5b33f6443b974b36b988130f1b156 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Tue, 2 Dec 2014 17:20:02 +0000
Subject: [PATCH] SYN-187: Set a more sensible default for the content_addr
---
synapse/config/server.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 814a4c349b..f8a0844b8c 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -35,8 +35,11 @@ class ServerConfig(Config):
if not args.content_addr:
host = args.server_name
if ':' not in host:
- host = "%s:%d" % (host, args.bind_port)
- args.content_addr = "https://%s" % (host,)
+ host = "%s:%d" % (host, args.unsecure_port)
+ else:
+ host = host.split(':')[0]
+ host = "%s:%d" % (host, args.unsecure_port)
+ args.content_addr = "http://%s" % (host,)
self.content_addr = args.content_addr
--
GitLab