aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2022-05-12 12:05:55 +0100
committerGitHub <noreply@github.com>2022-05-12 12:05:55 +0100
commitfc670f03a2ac13adc7e022bcb21b82ad874d6706 (patch)
treed844a59c9efb0867ad15d953d1dfcdc6d59e6fd0 /docs
parent0d1505a4c1ccca7c5cf4a64faf5d1044d8aa96f9 (diff)
Separate sample configs for monolith and polylith (#2456)
* Update sample configs * Update references * Remove sections that are dead in the monolith sample
Diffstat (limited to 'docs')
-rw-r--r--docs/FAQ.md2
-rw-r--r--docs/installation/7_configuration.md10
2 files changed, 7 insertions, 5 deletions
diff --git a/docs/FAQ.md b/docs/FAQ.md
index 571726d6..47f39b9e 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -58,7 +58,7 @@ Bridges known to work (as of v0.5.1):
* [Signal](https://docs.mau.fi/bridges/python/signal/index.html)
* [probably all other mautrix bridges](https://docs.mau.fi/bridges/)
-Remember to add the config file(s) to the `app_service_api` [config](https://github.com/matrix-org/dendrite/blob/de38be469a23813921d01bef3e14e95faab2a59e/dendrite-config.yaml#L130-L131).
+Remember to add the config file(s) to the `app_service_api` section of the config file.
## Is it possible to prevent communication with the outside world?
diff --git a/docs/installation/7_configuration.md b/docs/installation/7_configuration.md
index 868aba6e..e676afbe 100644
--- a/docs/installation/7_configuration.md
+++ b/docs/installation/7_configuration.md
@@ -7,11 +7,13 @@ permalink: /installation/configuration
# Populate the configuration
-The configuration file is used to configure Dendrite. A sample configuration file,
-called [`dendrite-config.yaml`](https://github.com/matrix-org/dendrite/blob/main/dendrite-config.yaml),
-is present in the top level of the Dendrite repository.
+The configuration file is used to configure Dendrite. Sample configuration files are
+present in the top level of the Dendrite repository:
-You will need to duplicate this file, calling it `dendrite.yaml` for example, and then
+* [`dendrite-sample.monolith.yaml`](https://github.com/matrix-org/dendrite/blob/main/dendrite-sample.monolith.yaml)
+* [`dendrite-sample.polylith.yaml`](https://github.com/matrix-org/dendrite/blob/main/dendrite-sample.polylith.yaml)
+
+You will need to duplicate the sample, calling it `dendrite.yaml` for example, and then
tailor it to your installation. At a minimum, you will need to populate the following
sections: