diff options
author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-12-16 14:40:47 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-16 14:40:47 -0500 |
commit | 44b7d4c6d6d5e8d78bd0154b407defea4a35aebd (patch) | |
tree | ca509f18939ca5b87f93d17e7a4372fdd3dd7d20 /docs/sample_config.yaml | |
parent | Convert internal pusher dicts to attrs classes. (#8940) (diff) | |
download | synapse-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 'docs/sample_config.yaml')
-rw-r--r-- | docs/sample_config.yaml | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index f196781c1c..75a01094d5 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -173,6 +173,18 @@ pid_file: DATADIR/homeserver.pid # - 'fe80::/10' # - 'fc00::/7' +# 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. # @@ -671,18 +683,6 @@ acme: # - nyc.example.com # - syd.example.com -# 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' - # Report prometheus metrics on the age of PDUs being sent to and received from # the following domains. This can be used to give an idea of "delay" on inbound # and outbound federation, though be aware that any delay can be due to problems |