Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Mark Haines 2014-12-02 17:21:17 +00:00
parent 481f5a2cbe 7993e3d10d
commit c9f5af1de7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/config/server.py
View File

@ -35,8 +35,11 @@ class ServerConfig(Config):
if not args.content_addr: if not args.content_addr:
host = args.server_name host = args.server_name
if ':' not in host: if ':' not in host:
host = "%s:%d" % (host, args.bind_port) host = "%s:%d" % (host, args.unsecure_port)
args.content_addr = "https://%s" % (host,) else:
host = host.split(':')[0]
host = "%s:%d" % (host, args.unsecure_port)
args.content_addr = "http://%s" % (host,)
self.content_addr = args.content_addr self.content_addr = args.content_addr