summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2020-12-16 14:40:47 -0500
committerGitHub <noreply@github.com>2020-12-16 14:40:47 -0500
commit44b7d4c6d6d5e8d78bd0154b407defea4a35aebd (patch)
treeca509f18939ca5b87f93d17e7a4372fdd3dd7d20 /synapse/config/server.py
parentConvert internal pusher dicts to attrs classes. (#8940) (diff)
downloadsynapse-44b7d4c6d6d5e8d78bd0154b407defea4a35aebd.tar.xz
Fix the sample config location for the ip_range_whitelist setting. (#8954)
Move it from the federation section to the server section to match
ip_range_blacklist.
Diffstat (limited to 'synapse/config/server.py')
-rw-r--r--synapse/config/server.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index f3815e5add..7242a4aa8e 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -832,6 +832,18 @@ class ServerConfig(Config):
         #ip_range_blacklist:
 %(ip_range_blacklist)s
 
+        # List of IP address CIDR ranges that should be allowed for federation,
+        # identity servers, push servers, and for checking key validity for
+        # third-party invite events. This is useful for specifying exceptions to
+        # wide-ranging blacklisted target IP ranges - e.g. for communication with
+        # a push server only visible in your network.
+        #
+        # This whitelist overrides ip_range_blacklist and defaults to an empty
+        # list.
+        #
+        #ip_range_whitelist:
+        #   - '192.168.1.1'
+
         # List of ports that Synapse should listen on, their purpose and their
         # configuration.
         #