diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-05-03 19:25:01 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-05-03 19:25:01 +0100 |
| commit | 836d3adcce81bdafd8d9033df028485dcbb9d4ed (patch) | |
| tree | 1f8485651a7d7dc88908ae8783125c1b4afbf17d /docs | |
| parent | Add admin api for sending server_notices (#5121) (diff) | |
| parent | Merge tag 'v0.99.3.2' (diff) | |
| download | synapse-836d3adcce81bdafd8d9033df028485dcbb9d4ed.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/sample_config.yaml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index fa2bccd5ef..84337a7c72 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -548,11 +548,12 @@ uploads_path: "DATADIR/uploads" # height: 600 # method: scale -# Is the preview URL API enabled? If enabled, you *must* specify -# an explicit url_preview_ip_range_blacklist of IPs that the spider is -# denied from accessing. +# Is the preview URL API enabled? # -#url_preview_enabled: false +# 'false' by default: uncomment the following to enable it (and specify a +# url_preview_ip_range_blacklist blacklist). +# +#url_preview_enabled: true # List of IP address CIDR ranges that the URL preview spider is denied # from accessing. There are no defaults: you must explicitly @@ -562,6 +563,12 @@ uploads_path: "DATADIR/uploads" # synapse to issue arbitrary GET requests to your internal services, # causing serious security issues. # +# (0.0.0.0 and :: are always blacklisted, whether or not they are explicitly +# listed here, since they correspond to unroutable addresses.) +# +# This must be specified if url_preview_enabled is set. It is recommended that +# you uncomment the following list as a starting point. +# #url_preview_ip_range_blacklist: # - '127.0.0.0/8' # - '10.0.0.0/8' @@ -572,7 +579,7 @@ uploads_path: "DATADIR/uploads" # - '::1/128' # - 'fe80::/64' # - 'fc00::/7' -# + # List of IP address CIDR ranges that the URL preview spider is allowed # to access even if they are specified in url_preview_ip_range_blacklist. # This is useful for specifying exceptions to wide-ranging blacklisted |