diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-12-02 17:21:17 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-12-02 17:21:17 +0000 |
| commit | c9f5af1de7b70a405ca1ee7ce301d59a51435b98 (patch) | |
| tree | 8f61c4d8866734cf344742612ecdad1d425ae362 | |
| parent | Remove editor junk (diff) | |
| parent | SYN-187: Set a more sensible default for the content_addr (diff) | |
| download | synapse-c9f5af1de7b70a405ca1ee7ce301d59a51435b98.tar.xz | |
Merge branch 'master' into develop
| -rw-r--r-- | synapse/config/server.py | 7 |
1 files 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 |