- Fixed database names in INSTALL.md

- added comments for postgresql config in dendrite-config.yaml

dendrite-config.yaml

@@ -76,6 +76,7 @@ global:
 
     # Naffka database options. Not required when using Kafka.
     naffka_database:
+      #For postgres: connection_string: postgresql://user:password@localhost/dendrite_naffka
       connection_string: file:naffka.db
       max_open_conns: 100
       max_idle_conns: 2
@@ -97,6 +98,7 @@ app_service_api:
     listen: http://localhost:7777
     connect: http://localhost:7777
   database:
+    #For postgres: connection_string: postgresql://user:password@localhost/dendrite_appservice
     connection_string: file:appservice.db
     max_open_conns: 100
     max_idle_conns: 2
@@ -172,6 +174,7 @@ federation_sender:
     listen: http://localhost:7775
     connect: http://localhost:7775
   database:
+    #For postgres: connection_string: postgresql://user:password@localhost/dendrite_federationsender
     connection_string: file:federationsender.db
     max_open_conns: 100
     max_idle_conns: 2
@@ -198,6 +201,7 @@ key_server:
     listen: http://localhost:7779
     connect: http://localhost:7779
   database:
+    #For postgres: connection_string: postgresql://user:password@localhost/dendrite_keyserver
     connection_string: file:keyserver.db
     max_open_conns: 100
     max_idle_conns: 2
@@ -211,6 +215,7 @@ media_api:
   external_api:
     listen: http://[::]:8074
   database:
+    #For postgres: connection_string: postgresql://user:password@localhost/dendrite_mediaapi
     connection_string: file:mediaapi.db
     max_open_conns: 100
     max_idle_conns: 2
@@ -247,6 +252,7 @@ room_server:
     listen: http://localhost:7770
     connect: http://localhost:7770
   database:
+    #For postgres: connection_string: postgresql://user:password@localhost/dendrite_roomserver
     connection_string: file:roomserver.db
     max_open_conns: 100
     max_idle_conns: 2
@@ -258,6 +264,7 @@ signing_key_server:
     listen: http://localhost:7780
     connect: http://localhost:7780
   database:
+    #For postgres: connection_string: postgresql://user:password@localhost/dendrite_signingkeyserver
     connection_string: file:signingkeyserver.db
     max_open_conns: 100
     max_idle_conns: 2
@@ -287,6 +294,7 @@ sync_api:
   external_api:
     listen: http://[::]:8073
   database:
+    #For postgres: connection_string: postgresql://user:password@localhost/dendrite_syncapi
     connection_string: file:syncapi.db
     max_open_conns: 100
     max_idle_conns: 2
@@ -298,11 +306,13 @@ user_api:
     listen: http://localhost:7781
     connect: http://localhost:7781
   account_database:
+    #For postgres: connection_string: postgresql://user:password@localhost/dendrite_userapi_accounts
     connection_string: file:userapi_accounts.db
     max_open_conns: 100
     max_idle_conns: 2
     conn_max_lifetime: -1
   device_database:
+    #For postgres: connection_string: postgresql://user:password@localhost/dendrite_userapi_devices
     connection_string: file:userapi_devices.db
     max_open_conns: 100
     max_idle_conns: 2

docs/INSTALL.md

@@ -112,7 +112,7 @@ Assuming that Postgres 9.5 (or later) is installed:
 * Create the component databases:
 
   ```bash
-  for i in account device mediaapi syncapi roomserver signingkeyserver federationsender appservice e2ekey naffka userapi_accounts userapi_devices keyserver ; do
+  for i in userapi_accounts userapi_devices mediaapi syncapi roomserver signingkeyserver federationsender keyserver appservice e2ekey naffka ; do
       sudo -u postgres createdb -O dendrite dendrite_$i
   done
   ```