summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorSilke Hofstra <silke@slxh.eu>2017-09-02 17:26:40 +0200
committerSilke <silke@slxh.eu>2017-12-17 13:10:31 +0100
commit37d1a90025c7dd3d87487f8cc0e6794e29becb93 (patch)
tree154fa915805b137b4ea7406646bfb43d598ac426 /synapse/config
parentAdapt the default config to bind on IPv6. (diff)
downloadsynapse-37d1a90025c7dd3d87487f8cc0e6794e29becb93.tar.xz
Allow binds to both :: and 0.0.0.0
Binding on 0.0.0.0 when :: is specified in the bind_addresses is now allowed.
This causes a warning explaining the behaviour.
Configuration changed to match.

See #2232

Signed-off-by: Silke Hofstra <silke@slxh.eu>
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/server.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 9035fbf22d..436dd8a6fe 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -220,14 +220,12 @@ class ServerConfig(Config):
             port: %(bind_port)s
 
             # Local addresses to listen on.
-            # On Linux and Mac OS, this will listen on all IPv4 and IPv6
+            # 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:
               - '::'
-              # For systems other than Linux or Mac OS, uncomment the next line
-              # to also listen on IPv4.
-              #- '0.0.0.0'
+              - '0.0.0.0'
 
             # This is a 'http' listener, allows us to specify 'resources'.
             type: http
@@ -265,7 +263,7 @@ class ServerConfig(Config):
           # For when matrix traffic passes through loadbalancer that unwraps TLS.
           - port: %(unsecure_port)s
             tls: false
-            bind_addresses: ['::']
+            bind_addresses: ['::', '0.0.0.0']
             type: http
 
             x_forwarded: false