summary refs log tree commit diff
path: root/develop/sample_config.yaml
diff options
context:
space:
mode:
authorrichvdh <richvdh@users.noreply.github.com>2021-08-03 18:13:58 +0000
committerrichvdh <richvdh@users.noreply.github.com>2021-08-03 18:13:58 +0000
commitd8b6aca04b34e34b6cebb8058f53d2ca22c20998 (patch)
tree479e63a41b9df472c9a24e766692b0f33ef249e1 /develop/sample_config.yaml
parentdeploy: 4b10880da363efed5d066191190237f1c64fddfd (diff)
downloadsynapse-d8b6aca04b34e34b6cebb8058f53d2ca22c20998.tar.xz
deploy: 72935b7c5053af122c8cb5767a3e85a3a0f3a20c
Diffstat (limited to 'develop/sample_config.yaml')
-rw-r--r--develop/sample_config.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/develop/sample_config.yaml b/develop/sample_config.yaml
index a2efc14100..16843dd8c9 100644
--- a/develop/sample_config.yaml
+++ b/develop/sample_config.yaml
@@ -210,6 +210,8 @@ presence:
 #
 # This option replaces federation_ip_range_blacklist in Synapse v1.25.0.
 #
+# Note: The value is ignored when an HTTP proxy is in use
+#
 #ip_range_blacklist:
 #  - '127.0.0.0/8'
 #  - '10.0.0.0/8'
@@ -972,6 +974,8 @@ media_store_path: "DATADIR/media_store"
 # This must be specified if url_preview_enabled is set. It is recommended that
 # you uncomment the following list as a starting point.
 #
+# Note: The value is ignored when an HTTP proxy is in use
+#
 #url_preview_ip_range_blacklist:
 #  - '127.0.0.0/8'
 #  - '10.0.0.0/8'