Remove references to userapi_devices (fixes #2259)

This commit is contained in:
Neil Alexander 2022-03-09 16:38:50 +00:00
parent 089d16812c
commit d78e0a33e0
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
4 changed files with 32 additions and 42 deletions

View file

@ -312,11 +312,6 @@ user_api:
max_open_conns: 10 max_open_conns: 10
max_idle_conns: 2 max_idle_conns: 2
conn_max_lifetime: -1 conn_max_lifetime: -1
device_database:
connection_string: postgresql://dendrite:itsasecret@postgres/dendrite_userapi_devices?sslmode=disable
max_open_conns: 10
max_idle_conns: 2
conn_max_lifetime: -1
# Configuration for the Push Server API. # Configuration for the Push Server API.
push_server: push_server:
@ -348,7 +343,7 @@ tracing:
# Logging configuration, in addition to the standard logging that is sent to # Logging configuration, in addition to the standard logging that is sent to
# stdout by Dendrite. # stdout by Dendrite.
logging: logging:
- type: file - type: file
level: info level: info
params: params:
path: /var/log/dendrite path: /var/log/dendrite

View file

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
for db in userapi_accounts userapi_devices mediaapi syncapi roomserver keyserver federationapi appservice mscs; do for db in userapi_accounts mediaapi syncapi roomserver keyserver federationapi appservice mscs; do
createdb -U dendrite -O dendrite dendrite_$db createdb -U dendrite -O dendrite dendrite_$db
done done

View file

@ -87,7 +87,7 @@ On macOS, omit `sudo -u postgres` from the below commands.
* If you want to run each Dendrite component with its own database: * If you want to run each Dendrite component with its own database:
```bash ```bash
for i in mediaapi syncapi roomserver federationapi appservice keyserver userapi_accounts userapi_devices; do for i in mediaapi syncapi roomserver federationapi appservice keyserver userapi_accounts; do
sudo -u postgres createdb -O dendrite dendrite_$i sudo -u postgres createdb -O dendrite dendrite_$i
done done
``` ```

View file

@ -200,11 +200,6 @@ user_api:
max_open_conns: 100 max_open_conns: 100
max_idle_conns: 2 max_idle_conns: 2
conn_max_lifetime: -1 conn_max_lifetime: -1
device_database:
connection_string: file:userapi_devices.db
max_open_conns: 100
max_idle_conns: 2
conn_max_lifetime: -1
pusher_database: pusher_database:
connection_string: file:pushserver.db connection_string: file:pushserver.db
max_open_conns: 100 max_open_conns: 100