diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2014-11-11 16:40:50 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2014-11-11 16:40:50 +0000 |
| commit | a8ceeec0fd512e287cbf71efff42015787517a5d (patch) | |
| tree | 45643674a31b637799e347f2251c72417e685616 /synapse/app/homeserver.py | |
| parent | no evil horizontal textarea resizing (diff) | |
| parent | Fix bugs which broke federation due to changes in function signatures. (diff) | |
| download | synapse-a8ceeec0fd512e287cbf71efff42015787517a5d.tar.xz | |
Merge pull request #12 from matrix-org/federation_authorization
Federation authorization
Diffstat (limited to 'synapse/app/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index b3dae5da64..43164c8d67 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -236,7 +236,10 @@ def setup(): f.namespace['hs'] = hs reactor.listenTCP(config.manhole, f, interface='127.0.0.1') - hs.start_listening(config.bind_port, config.unsecure_port) + bind_port = config.bind_port + if config.no_tls: + bind_port = None + hs.start_listening(bind_port, config.unsecure_port) if config.daemonize: print config.pid_file |