diff options
| author | Matthew Hodgson <matthew@arasphere.net> | 2018-11-06 18:14:39 +0000 |
|---|---|---|
| committer | Brendan Abolivier <contact@brendanabolivier.com> | 2018-11-06 18:14:39 +0000 |
| commit | daf57b19b71b036f35cd3f8e7d399ae04736b0b0 (patch) | |
| tree | 5c875fbd06db720a593b68ad044aee7245b761dd /docker | |
| parent | 8ff136e595af05c8e844d2f9bf23831a9a9eddc0 (diff) | |
make docker work on current codebase (#584)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/dendrite-docker.yml | 5 | ||||
| -rw-r--r-- | docker/postgres/create_db.sh | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/docker/dendrite-docker.yml b/docker/dendrite-docker.yml index 024eee72..9fe366f3 100644 --- a/docker/dendrite-docker.yml +++ b/docker/dendrite-docker.yml @@ -86,8 +86,10 @@ kafka: topics: output_room_event: roomserverOutput output_client_data: clientapiOutput + output_typing_event: typingServerOutput user_updates: userUpdates + # The postgres connection configs for connecting to the databases e.g a postgres:// URI database: account: "postgres://dendrite:itsasecret@postgres/dendrite_account?sslmode=disable" @@ -98,6 +100,7 @@ database: server_key: "postgres://dendrite:itsasecret@postgres/dendrite_serverkey?sslmode=disable" federation_sender: "postgres://dendrite:itsasecret@postgres/dendrite_federationsender?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 naffka: "postgres://dendrite:itsasecret@postgres/dendrite_naffka?sslmode=disable" @@ -117,7 +120,7 @@ listen: tracing: # Config for the jaeger opentracing reporter. # See https://godoc.org/github.com/uber/jaeger-client-go/config#Configuration - # for documtation. + # for documentation. jaeger: disabled: true diff --git a/docker/postgres/create_db.sh b/docker/postgres/create_db.sh index 56f6540e..8ed11db1 100644 --- a/docker/postgres/create_db.sh +++ b/docker/postgres/create_db.sh @@ -1,5 +1,5 @@ #!/bin/bash -for db in account device mediaapi syncapi roomserver serverkey federationsender publicroomsapi naffka; do - createdb -O dendrite dendrite_$db +for db in account device mediaapi syncapi roomserver serverkey federationsender publicroomsapi appservice naffka; do + createdb -U dendrite -O dendrite dendrite_$db done |