diff options
author | Richard van der Hoff <richard@matrix.org> | 2019-02-13 14:27:45 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2019-02-13 14:27:45 +0000 |
commit | c1dfd6a18abb774686e8a600a30c39f180a162d2 (patch) | |
tree | 11d991ddb7f40b5126991c0098cc1d5ac5fe8c75 /synapse/config | |
parent | Run `black` on user directory code (#4635) (diff) | |
parent | Merge pull request #4636 from matrix-org/rav/bind_address_fixes (diff) | |
download | synapse-c1dfd6a18abb774686e8a600a30c39f180a162d2.tar.xz |
Merge remote-tracking branch 'origin/release-v0.99.1' into develop
Diffstat (limited to 'synapse/config')
-rw-r--r-- | synapse/config/server.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index c5c3aac8ed..93a30e4cfa 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -151,7 +151,11 @@ class ServerConfig(Config): # if we still have an empty list of addresses, use the default list if not bind_addresses: - bind_addresses.extend(DEFAULT_BIND_ADDRESSES) + if listener['type'] == 'metrics': + # the metrics listener doesn't support IPv6 + bind_addresses.append('0.0.0.0') + else: + bind_addresses.extend(DEFAULT_BIND_ADDRESSES) self.listeners.append(listener) |