Tons of updates to fix migration to new server.

2 files changed, 17 insertions, 1 deletions

diff --git a/dendrite/server/templates/dendrite.yaml.j2 b/dendrite/server/templates/dendrite.yaml.j2
index 7c0ff34..3dcf474 100644
--- a/dendrite/server/templates/dendrite.yaml.j2
+++ b/dendrite/server/templates/dendrite.yaml.j2
@@ -68,6 +68,10 @@ global:
   # The base URL to delegate client-server communications to e.g. https://localhost
   well_known_client_name: ""
 
+  # The server name to delegate sliding sync communications to, with optional port.
+  # Requires `well_known_client_name` to also be configured.
+  well_known_sliding_sync_proxy: ""
+
   # Lists of domains that the server will trust as identity servers to verify third
   # party identifiers such as phone numbers and email addresses.
   trusted_third_party_id_servers:
@@ -146,6 +150,13 @@ app_service_api:
   # to be sent to an insecure endpoint.
   disable_tls_validation: false
 
+  # Send the access_token query parameter with appservice requests in addition
+  # to the Authorization header. This can cause hs_tokens to be saved to logs,
+  # so it should not be enabled unless absolutely necessary.
+  legacy_auth: false
+  # Use the legacy unprefixed paths for appservice requests.
+  legacy_paths: false
+
   # Appservice configuration files to load into this homeserver.
   config_files:
   #  - /path/to/appservice_registration.yaml
@@ -312,6 +323,10 @@ user_api:
   auto_join_rooms:
   #  - "#main:matrix.org"
 
+  # The number of workers to start for the DeviceListUpdater. Defaults to 8.
+  # This only needs updating if the "InputDeviceListUpdate" stream keeps growing indefinitely.
+  # worker_count: 8
+
 # Configuration for Opentracing.
 # See https://github.com/matrix-org/dendrite/tree/master/docs/tracing for information on
 # how this works and how to set it up.
diff --git a/dendrite/server/templates/setup_db.psql.j2 b/dendrite/server/templates/setup_db.psql.j2
index 02b3e2f..29c6974 100644
--- a/dendrite/server/templates/setup_db.psql.j2
+++ b/dendrite/server/templates/setup_db.psql.j2
@@ -1,2 +1,3 @@
-CREATE USER {{dendrite_db_user}} WITH ENCRYPTED PASSWORD '{{dendrite_db_pass}}';
+CREATE USER {{dendrite_db_user}};
+ALTER USER {{dendrite_db_user}} WITH PASSWORD '{{dendrite_db_pass}}'
 CREATE DATABASE {{dendrite_db}} WITH OWNER {{dendrite_db_user}};