summary refs log tree commit diff
path: root/demo/start.sh
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-22 18:44:29 +0100
committerErik Johnston <erik@matrix.org>2019-10-22 18:44:29 +0100
commitc17efdc01c36b5078a7306843c560abd2b3238f9 (patch)
treec96bca83c8dba442c63c52e8e18bae29a1eb8ce8 /demo/start.sh
parentClean up prepare_database.py a bit and add comments (diff)
parentMerge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2 (diff)
downloadsynapse-c17efdc01c36b5078a7306843c560abd2b3238f9.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_stores
Diffstat (limited to 'demo/start.sh')
-rwxr-xr-xdemo/start.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/demo/start.sh b/demo/start.sh
index eccaa2abeb..83396e5c33 100755
--- a/demo/start.sh
+++ b/demo/start.sh
@@ -77,14 +77,13 @@ for port in 8080 8081 8082; do
 
         # Reduce the blacklist
         blacklist=$(cat <<-BLACK
-		# Set the blacklist so that it doesn't include 127.0.0.1
+		# Set the blacklist so that it doesn't include 127.0.0.1, ::1
 		federation_ip_range_blacklist:
 		  - '10.0.0.0/8'
 		  - '172.16.0.0/12'
 		  - '192.168.0.0/16'
 		  - '100.64.0.0/10'
 		  - '169.254.0.0/16'
-		  - '::1/128'
 		  - 'fe80::/64'
 		  - 'fc00::/7'
 		BLACK