diff options
| author | David Baker <dave@matrix.org> | 2014-12-18 15:06:11 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2014-12-18 15:06:11 +0000 |
| commit | 0a6664493a6277d6b7b78b54e0b2a6da591ad158 (patch) | |
| tree | a01e93cb31ca94d83dba6a9a381997b88f5b3a25 /synapse/config/server.py | |
| parent | Thank you, pyflakes (diff) | |
| parent | Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse (diff) | |
| download | synapse-0a6664493a6277d6b7b78b54e0b2a6da591ad158.tar.xz | |
Merge branch 'master' into pushers
Diffstat (limited to 'synapse/config/server.py')
| -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 |