From 62d75f64187b16d1531bc98ac53d788592623e92 Mon Sep 17 00:00:00 2001 From: Marco Kundt Date: Sat, 12 Dec 2020 21:40:02 +0100 Subject: [PATCH] fix database names to reflect renaming --- build/docker/config/dendrite-config.yaml | 4 ++-- build/docker/postgres/create_db.sh | 2 +- docs/INSTALL.md | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/docker/config/dendrite-config.yaml b/build/docker/config/dendrite-config.yaml index 94dcd992d..c6faff745 100644 --- a/build/docker/config/dendrite-config.yaml +++ b/build/docker/config/dendrite-config.yaml @@ -298,12 +298,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 0b3f932be..d882e67a4 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -99,7 +99,7 @@ Assuming that PostgreSQL 9.6 (or later) is installed: * Create the component databases: ```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 ``` @@ -140,8 +140,8 @@ Create config file, based on `dendrite-config.yaml`. Call it `dendrite.yaml`. Th * The `server_name` entry to reflect the hostname of your Dendrite server * The `database` lines with an updated connection string based on your desired setup, e.g. replacing `database` with the name of the database: - * For Postgres: `postgres://dendrite:password@localhost/database`, e.g. `postgres://dendrite:password@localhost/dendrite_userapi_account.db` - * For SQLite on disk: `file:component.db` or `file:///path/to/component.db`, e.g. `file:userapi_account.db` + * For Postgres: `postgres://dendrite:password@localhost/database`, e.g. `postgres://dendrite:password@localhost/dendrite_userapi_accounts.db` + * For SQLite on disk: `file:component.db` or `file:///path/to/component.db`, e.g. `file:userapi_accounts.db` * Postgres and SQLite can be mixed and matched on different components as desired. * The `use_naffka` option if using Naffka in a monolith deployment