diff options
| author | Erik Johnston <erik@matrix.org> | 2019-09-25 17:53:13 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-09-25 17:53:13 +0100 |
| commit | 4fb3c129aa96377d5b78c9e39d42eee2a4e9ae88 (patch) | |
| tree | 7780de5531566372372992521f2476551a51be73 /synapse/config/server.py | |
| parent | Review comments (diff) | |
| parent | Merge pull request #6089 from matrix-org/erikj/cleanup_user_ips (diff) | |
| download | synapse-4fb3c129aa96377d5b78c9e39d42eee2a4e9ae88.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_user_ips_2
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index f8b7b4bef9..9d3f1b5bfc 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -362,10 +362,8 @@ class ServerConfig(Config): _check_resource_config(self.listeners) - # An experimental option to try and periodically clean up extremities - # by sending dummy events. self.cleanup_extremities_with_dummy_events = config.get( - "cleanup_extremities_with_dummy_events", False + "cleanup_extremities_with_dummy_events", True ) def has_tls_listener(self): @@ -552,6 +550,9 @@ class ServerConfig(Config): # blacklist IP address CIDR ranges. If this option is not specified, or # specified with an empty list, no ip range blacklist will be enforced. # + # As of Synapse v1.4.0 this option also affects any outbound requests to identity + # servers provided by user input. + # # (0.0.0.0 and :: are always blacklisted, whether or not they are explicitly # listed here, since they correspond to unroutable addresses.) # |