Adapt the default config to bind on IPv6.

Most deployments are on Linux (or Mac OS), so this would actually bind
on both IPv4 and IPv6.

Resolves #1886.

Signed-off-by: Willem Mulder <willemmaster@hotmail.com>
This commit is contained in:
Willem Mulder 2017-05-18 15:35:36 +02:00 committed by Silke
parent ba24576f2f
commit 3e59143ba8

View File

@ -220,13 +220,14 @@ class ServerConfig(Config):
port: %(bind_port)s port: %(bind_port)s
# Local addresses to listen on. # Local addresses to listen on.
# This will listen on all IPv4 addresses by default. # On Linux and Mac OS, this will listen on all IPv4 and IPv6
# addresses by default. For most other OSes, this will only listen
# on IPv6.
bind_addresses: bind_addresses:
- '0.0.0.0' - '::'
# Uncomment to listen on all IPv6 interfaces # For systems other than Linux or Mac OS, uncomment the next line
# N.B: On at least Linux this will also listen on all IPv4 # to also listen on IPv4.
# addresses, so you will need to comment out the line above. #- '0.0.0.0'
# - '::'
# This is a 'http' listener, allows us to specify 'resources'. # This is a 'http' listener, allows us to specify 'resources'.
type: http type: http
@ -264,7 +265,7 @@ class ServerConfig(Config):
# For when matrix traffic passes through loadbalancer that unwraps TLS. # For when matrix traffic passes through loadbalancer that unwraps TLS.
- port: %(unsecure_port)s - port: %(unsecure_port)s
tls: false tls: false
bind_addresses: ['0.0.0.0'] bind_addresses: ['::']
type: http type: http
x_forwarded: false x_forwarded: false
@ -278,7 +279,7 @@ class ServerConfig(Config):
# Turn on the twisted ssh manhole service on localhost on the given # Turn on the twisted ssh manhole service on localhost on the given
# port. # port.
# - port: 9000 # - port: 9000
# bind_address: 127.0.0.1 # bind_addresses: ['::1', '127.0.0.1']
# type: manhole # type: manhole
""" % locals() """ % locals()