MirrorHub/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-07-04 18:08:35 +02:00
Code Issues Releases Activity

Merge branch 'master' into 'master'

Browse source 
Fix docker-compose trusted_servers env var

See merge request famedly/conduit!87
This commit is contained in:
Timo Kösters 2021-05-26 07:03:51 +00:00
parent 1aec80c57c 8387ceacab
commit d1c0eaf628
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docker-compose.yml
View file

@ -26,8 +26,7 @@ services:
# - ./conduit.toml:/srv/conduit/conduit.toml
environment:
CONDUIT_SERVER_NAME: localhost:8000 # replace with your own name
CONDUIT_TRUSTED_SERVERS:
- 'matrix.org'
CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
### Uncomment and change values as desired
# CONDUIT_ADDRESS: 127.0.0.1
# CONDUIT_PORT: 8000

3
docker/docker-compose.traefik.yml
View file

@ -26,8 +26,7 @@ services:
- proxy
environment:
CONDUIT_SERVER_NAME: localhost:8000 # replace with your own name
CONDUIT_TRUSTED_SERVERS:
- 'matrix.org'
CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
### Uncomment and change values as desired
# CONDUIT_ADDRESS: 127.0.0.1
# CONDUIT_PORT: 8000