shruub
/
conduit
mirror of https://gitlab.com/famedly/conduit
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Fix docker-compose trusted_servers env var

See merge request famedly/conduit!87
merge-requests/88/head
Timo Kösters 3 years ago
parent 1aec80c57c 8387ceacab
commit d1c0eaf628
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File

3
docker-compose.yml
Unescape Escape View File

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

3
docker/docker-compose.traefik.yml
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save