crappyrules
/
conduit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' into 'master' 

Fix docker-compose trusted_servers env var

See merge request famedly/conduit!87
merge-requests/87/merge
Weasy 5 years ago
parent
1aec80c57c 8387ceacab
commit
6e817da8c9
2 changed files with 2 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      docker-compose.yml
  2. 3
      docker/docker-compose.traefik.yml

3
docker-compose.yml
Unescape 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 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