diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-10-22 13:52:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-22 13:52:25 +0100 |
| commit | b2945d26727520378f1f80bf96eed24638c360cf (patch) | |
| tree | 69cac027e529ad19aea35602015d3fb7df2dcb9f | |
| parent | Update postgres.md (#6234) (diff) | |
| download | synapse-b2945d26727520378f1f80bf96eed24638c360cf.tar.xz | |
Fix demo script on ipv6-supported boxes (#6229)
The synapse demo was a bit flakey in terms of supporting federation. It turns out that if your computer resolved `localhost` to `::1` instead of `127.0.0.1`, the built-in federation blacklist specified in `start.sh` would still block it, since it contained an entry for `::/127`. Removing this no longer prevents Synapse from contacting `::1`, federation works again on these boxes.
| -rw-r--r-- | changelog.d/6229.bugfix | 1 | ||||
| -rwxr-xr-x | demo/start.sh | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/changelog.d/6229.bugfix b/changelog.d/6229.bugfix new file mode 100644 index 0000000000..bced3304d0 --- /dev/null +++ b/changelog.d/6229.bugfix @@ -0,0 +1 @@ +Prevent the demo Synapse's from blacklisting `::1`. \ No newline at end of file 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 |