Merge branch 'moa31-next-patch-76037' into 'next'

Change listen address when running inside a Container to prevent Bad Gateway error

See merge request famedly/conduit!207
This commit is contained in:
Timo Kösters 2021-10-15 10:51:19 +00:00
commit 87694f4369

View File

@ -40,6 +40,7 @@ trusted_servers = ["matrix.org"]
#workers = 4 # default: cpu core count * 2
address = "127.0.0.1" # This makes sure Conduit can only be reached using the reverse proxy
#address = "0.0.0.0" # If Conduit is running in a container, make sure the reverse proxy (ie. Traefik) can reach it.
proxy = "none" # more examples can be found at src/database/proxy.rs:6