0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-14 15:03:53 +01:00

Merge branch 'master' into develop

This commit is contained in:
Mark Haines 2014-12-02 17:21:17 +00:00
commit c9f5af1de7

View file

@ -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