From d1496793b9c21da4195d19f526d85567d277f7f0 Mon Sep 17 00:00:00 2001 From: Marco Kundt <1415596+flexo3001@users.noreply.github.com> Date: Wed, 17 Feb 2021 16:20:06 +0100 Subject: [PATCH] fix database names to reflect renaming (#1636) Co-authored-by: Neil Alexander --- build/docker/config/dendrite-config.yaml | 4 ++-- build/docker/postgres/create_db.sh | 2 +- docs/INSTALL.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/docker/config/dendrite-config.yaml b/build/docker/config/dendrite-config.yaml index ca59ae03b..ffcf6a451 100644 --- a/build/docker/config/dendrite-config.yaml +++ b/build/docker/config/dendrite-config.yaml @@ -309,12 +309,12 @@ user_api: listen: http://0.0.0.0:7781 connect: http://user_api:7781 account_database: - connection_string: postgresql://dendrite:itsasecret@postgres/dendrite_account?sslmode=disable + connection_string: postgresql://dendrite:itsasecret@postgres/dendrite_userapi_accounts?sslmode=disable max_open_conns: 10 max_idle_conns: 2 conn_max_lifetime: -1 device_database: - connection_string: postgresql://dendrite:itsasecret@postgres/dendrite_device?sslmode=disable + connection_string: postgresql://dendrite:itsasecret@postgres/dendrite_userapi_devices?sslmode=disable max_open_conns: 10 max_idle_conns: 2 conn_max_lifetime: -1 diff --git a/build/docker/postgres/create_db.sh b/build/docker/postgres/create_db.sh index 7495a3978..eb77bb26f 100755 --- a/build/docker/postgres/create_db.sh +++ b/build/docker/postgres/create_db.sh @@ -1,5 +1,5 @@ #!/bin/sh -for db in account device mediaapi syncapi roomserver signingkeyserver keyserver federationsender appservice naffka; do +for db in userapi_accounts userapi_devices mediaapi syncapi roomserver signingkeyserver keyserver federationsender appservice naffka; do createdb -U dendrite -O dendrite dendrite_$db done diff --git a/docs/INSTALL.md b/docs/INSTALL.md index f51660e43..1099bc838 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -109,7 +109,7 @@ On macOS, omit `sudo -u postgres` from the below commands. * If you want to run each Dendrite component with its own database: ```bash - for i in mediaapi syncapi roomserver signingkeyserver federationsender appservice keyserver userapi_account userapi_device naffka; do + for i in mediaapi syncapi roomserver signingkeyserver federationsender appservice keyserver userapi_accounts userapi_devices naffka; do sudo -u postgres createdb -O dendrite dendrite_$i done ```