Update the example configs with the new unified config

dendrite-config.yaml

@@ -0,0 +1,73 @@
+# The config file version format
+version: v0
+
+# The matrix specific config
+matrix:
+    # The name of the server. This is usually the domain name, e.g 'matrix.org', 'localhost'.
+    server_name: "example.com"
+    # The path to the PEM formatted matrix private key.
+    private_key: "/var/dendrite/matrix_key.pem"
+    # The x509 certificates used by the federation listeners for this server
+    federation_certificates: ["/var/dendrite/federation_tls.pem"]
+
+# The media repository config
+media:
+    # The base path to where the media files will be stored. May be relative or absolute.
+    base_path: /var/dendrite/media
+
+    # The maximum file size in bytes that is allowed to be stored on this server.
+    # Note: if max_file_size_bytes is set to 0, the size is unlimited.
+    # Note: if max_file_size_bytes is not set, it will default to 10485760 (10MB)
+    max_file_size_bytes: 10485760
+
+    # Whether to dynamically generate thumbnails on-the-fly if the requested resolution is not already generated
+    # NOTE: This is a possible denial-of-service attack vector - use at your own risk
+    dynamic_thumbnails: false
+
+    # A list of thumbnail sizes to be pre-generated for downloaded remote / uploaded content
+    # method is one of crop or scale. If omitted, it will default to scale.
+    # crop scales to fill the requested dimensions and crops the excess.
+    # scale scales to fit the requested dimensions and one dimension may be smaller than requested.
+    thumbnail_sizes:
+      - width: 32
+        height: 32
+        method: crop
+      - width: 96
+        height: 96
+        method: crop
+      - width: 320
+        height: 240
+        method: scale
+      - width: 640
+        height: 480
+        method: scale
+      - width: 800
+        height: 600
+        method: scale
+
+# The config for communicating with kafka
+kafka:
+    # Where the kafka servers are running.
+    addresses: ["localhost:9092"]
+    # The names of the kafka topics to use.
+    topics:
+        input_room_event: roomserverInput
+        output_room_event: roomserverOutput
+
+# The postgres connection configs for connecting to the databases e.g a postgres:// URI
+database:
+    account: "postgres://dendrite:itsasecret@localhost/account?sslmode=disable"
+    device: "postgres://dendrite:itsasecret@localhost/device?sslmode=disable"
+    media_api: "postgres://dendrite:itsasecret@localhost/media_api?sslmode=disable"
+    sync_api: "postgres://dendrite:itsasecret@localhost/sync_api?sslmode=disable"
+    room_server: "postgres://dendrite:itsasecret@localhost/room_server?sslmode=disable"
+    server_key: "postgres://dendrite:itsasecret@localhost/server_key?sslmode=disable"
+
+# The TCP host:port pairs to bind the internal HTTP APIs to.
+# These shouldn't be exposed to the public internet.
+listen:
+    room_server: "localhost:7770"
+    client_api: "localhost:7771"
+    federation_api: "localhost:7772"
+    sync_api: "localhost:7773"
+    media_api: "localhost:7774"

media-api-server-config.yaml

@@ -1,38 +0,0 @@
-# The name of the server. This is usually the domain name, e.g 'matrix.org', 'localhost'.
-server_name: "example.com"
-
-# The base path to where the media files will be stored. May be relative or absolute.
-base_path: /var/dendrite/media
-
-# The maximum file size in bytes that is allowed to be stored on this server.
-# Note: if max_file_size_bytes is set to 0, the size is unlimited.
-# Note: if max_file_size_bytes is not set, it will default to 10485760 (10MB)
-max_file_size_bytes: 10485760
-
-# The postgres connection config for connecting to the database e.g a postgres:// URI
-database: "postgres://dendrite:itsasecret@localhost/mediaapi?sslmode=disable"
-
-# Whether to dynamically generate thumbnails on-the-fly if the requested resolution is not already generated
-# NOTE: This is a possible denial-of-service attack vector - use at your own risk
-dynamic_thumbnails: false
-
-# A list of thumbnail sizes to be pre-generated for downloaded remote / uploaded content
-# method is one of crop or scale. If omitted, it will default to scale.
-# crop scales to fill the requested dimensions and crops the excess.
-# scale scales to fit the requested dimensions and one dimension may be smaller than requested.
-thumbnail_sizes:
-- width: 32
-  height: 32
-  method: crop
-- width: 96
-  height: 96
-  method: crop
-- width: 320
-  height: 240
-  method: scale
-- width: 640
-  height: 480
-  method: scale
-- width: 800
-  height: 600
-  method: scale

sync-server-config.yaml

@@ -1,8 +0,0 @@
-# A list of URIs which host Kafka logs.
-consumer_uris: ["localhost:9092"]
-
-# The name of the topic which the sync server will consume events from.
-roomserver_topic: "roomserverOutput"
-
-# The database URI to store sync server information.
-database: "postgres://dendrite:itsasecret@localhost/syncserver?sslmode=disable"