mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-09 13:42:02 +00:00
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.
This commit is contained in:
parent
bd30cfe86a
commit
44b7d4c6d6
1
changelog.d/8954.feature
Normal file
1
changelog.d/8954.feature
Normal file
@ -0,0 +1 @@
|
|||||||
|
Apply an IP range blacklist to push and key revocation requests.
|
@ -173,6 +173,18 @@ pid_file: DATADIR/homeserver.pid
|
|||||||
# - 'fe80::/10'
|
# - 'fe80::/10'
|
||||||
# - 'fc00::/7'
|
# - '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
|
# List of ports that Synapse should listen on, their purpose and their
|
||||||
# configuration.
|
# configuration.
|
||||||
#
|
#
|
||||||
@ -671,18 +683,6 @@ acme:
|
|||||||
# - nyc.example.com
|
# - nyc.example.com
|
||||||
# - syd.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
|
# 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
|
# 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
|
# and outbound federation, though be aware that any delay can be due to problems
|
||||||
|
@ -56,18 +56,6 @@ class FederationConfig(Config):
|
|||||||
# - nyc.example.com
|
# - nyc.example.com
|
||||||
# - syd.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
|
# 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
|
# 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
|
# and outbound federation, though be aware that any delay can be due to problems
|
||||||
|
@ -832,6 +832,18 @@ class ServerConfig(Config):
|
|||||||
#ip_range_blacklist:
|
#ip_range_blacklist:
|
||||||
%(ip_range_blacklist)s
|
%(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
|
# List of ports that Synapse should listen on, their purpose and their
|
||||||
# configuration.
|
# configuration.
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user