diff options
| author | Matthew Hodgson <matthew@arasphere.net> | 2016-12-19 23:49:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-19 23:49:34 +0000 |
| commit | da2c8f3c94139d3d8d1b9b39622146e195b7c74e (patch) | |
| tree | cf3ab98691d2acd2508b5aecf403a05542b1cf40 /synapse/config/server.py | |
| parent | Merge pull request #1696 from kyrias/ipv6 (diff) | |
| parent | Add IPv6 comment to default config (diff) | |
| download | synapse-da2c8f3c94139d3d8d1b9b39622146e195b7c74e.tar.xz | |
Merge pull request #1709 from kyrias/bind_addresses
Add support for specifying multiple bind addresses
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 634d8e6fe5..5e6b2a68a7 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -155,9 +155,14 @@ class ServerConfig(Config): # The port to listen for HTTPS requests on. port: %(bind_port)s - # Local interface to listen on. - # The empty string will cause synapse to listen on all interfaces. - bind_address: '' + # Local addresses to listen on. + # This will listen on all IPv4 addresses by default. + 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 @@ -188,7 +193,7 @@ class ServerConfig(Config): # For when matrix traffic passes through loadbalancer that unwraps TLS. - port: %(unsecure_port)s tls: false - bind_address: '' + bind_addresses: ['0.0.0.0'] type: http x_forwarded: false |