1f349/dendrite
4
0
Fork 0
mirror of https://github.com/1f349/dendrite.git synced 2024-11-29 15:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

make docker work on current codebase (#584)

Browse Source
This commit is contained in:
Matthew Hodgson 2018-11-06 18:14:39 +00:00 committed by Brendan Abolivier
parent 8ff136e595
commit daf57b19b7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/dendrite-docker.yml
View File

@ -86,8 +86,10 @@ kafka:
topics: topics:
output_room_event: roomserverOutput output_room_event: roomserverOutput
output_client_data: clientapiOutput output_client_data: clientapiOutput
output_typing_event: typingServerOutput
user_updates: userUpdates user_updates: userUpdates
# The postgres connection configs for connecting to the databases e.g a postgres:// URI # The postgres connection configs for connecting to the databases e.g a postgres:// URI
database: database:
account: "postgres://dendrite:itsasecret@postgres/dendrite_account?sslmode=disable" account: "postgres://dendrite:itsasecret@postgres/dendrite_account?sslmode=disable"
@ -98,6 +100,7 @@ database:
server_key: "postgres://dendrite:itsasecret@postgres/dendrite_serverkey?sslmode=disable" server_key: "postgres://dendrite:itsasecret@postgres/dendrite_serverkey?sslmode=disable"
federation_sender: "postgres://dendrite:itsasecret@postgres/dendrite_federationsender?sslmode=disable" federation_sender: "postgres://dendrite:itsasecret@postgres/dendrite_federationsender?sslmode=disable"
public_rooms_api: "postgres://dendrite:itsasecret@postgres/dendrite_publicroomsapi?sslmode=disable" public_rooms_api: "postgres://dendrite:itsasecret@postgres/dendrite_publicroomsapi?sslmode=disable"
appservice: "postgres://dendrite:itsasecret@postgres/dendrite_appservice?sslmode=disable"
# If using naffka you need to specify a naffka database # If using naffka you need to specify a naffka database
naffka: "postgres://dendrite:itsasecret@postgres/dendrite_naffka?sslmode=disable" naffka: "postgres://dendrite:itsasecret@postgres/dendrite_naffka?sslmode=disable"
@ -117,7 +120,7 @@ listen:
tracing: tracing:
# Config for the jaeger opentracing reporter. # Config for the jaeger opentracing reporter.
# See https://godoc.org/github.com/uber/jaeger-client-go/config#Configuration # See https://godoc.org/github.com/uber/jaeger-client-go/config#Configuration
# for documtation. # for documentation.
jaeger: jaeger:
disabled: true disabled: true

4
docker/postgres/create_db.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
for db in account device mediaapi syncapi roomserver serverkey federationsender publicroomsapi naffka; do for db in account device mediaapi syncapi roomserver serverkey federationsender publicroomsapi appservice naffka; do
createdb -O dendrite dendrite_$db createdb -U dendrite -O dendrite dendrite_$db
done done