From aac2c49b9b8a241f7a13726cfa74bf3a67c9079f Mon Sep 17 00:00:00 2001
From: Michael Kutzner <65556178+mikure@users.noreply.github.com>
Date: Tue, 15 Jun 2021 09:53:55 +0200
Subject: Fix 'ip_range_whitelist' not working for federation servers (#10115)

Add 'federation_ip_range_whitelist'. This allows backwards-compatibility, If 'federation_ip_range_blacklist' is set. Otherwise 'ip_range_whitelist' will be used for federation servers.

Signed-off-by: Michael Kutzner 1mikure@gmail.com
---
 changelog.d/10115.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/10115.bugfix

(limited to 'changelog.d/10115.bugfix')

diff --git a/changelog.d/10115.bugfix b/changelog.d/10115.bugfix
new file mode 100644
index 0000000000..e16f356e68
--- /dev/null
+++ b/changelog.d/10115.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in Synapse v1.25.0 that prevented the `ip_range_whitelist` configuration option from working for federation and identity servers. Contributed by @mikure.
-- 
cgit 1.5.1