diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-12-18 22:34:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-18 22:34:50 +0000 |
| commit | 48fa4e1e5b102cad4690786ec1f54b93aa90a6db (patch) | |
| tree | c1c1097431e4398de9a02107f9a98075efd230df /synapse/config | |
| parent | Merge pull request #2717 from matrix-org/erikj/createroom_content (diff) | |
| parent | Implement listen_tcp method in remaining workers (diff) | |
| download | synapse-48fa4e1e5b102cad4690786ec1f54b93aa90a6db.tar.xz | |
Merge pull request #2435 from silkeh/listen-ipv6-default
Adapt the default config to bind on both IPv4 and IPv6 on all platforms
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/server.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index edb90a1348..436dd8a6fe 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -220,13 +220,12 @@ class ServerConfig(Config): port: %(bind_port)s # Local addresses to listen on. - # This will listen on all IPv4 addresses by default. + # On Linux and Mac OS, `::` will listen on all IPv4 and IPv6 + # addresses by default. For most other OSes, this will only listen + # on IPv6. bind_addresses: + - '::' - '0.0.0.0' - # Uncomment to listen on all IPv6 interfaces - # N.B: On at least Linux this will also listen on all IPv4 - # addresses, so you will need to comment out the line above. - # - '::' # This is a 'http' listener, allows us to specify 'resources'. type: http @@ -264,7 +263,7 @@ class ServerConfig(Config): # For when matrix traffic passes through loadbalancer that unwraps TLS. - port: %(unsecure_port)s tls: false - bind_addresses: ['0.0.0.0'] + bind_addresses: ['::', '0.0.0.0'] type: http x_forwarded: false @@ -278,7 +277,7 @@ class ServerConfig(Config): # Turn on the twisted ssh manhole service on localhost on the given # port. # - port: 9000 - # bind_address: 127.0.0.1 + # bind_addresses: ['::1', '127.0.0.1'] # type: manhole """ % locals() |