From 2fffcb24d8c799a08f250af31da239494b3bda1b Mon Sep 17 00:00:00 2001 From: reivilibre Date: Fri, 12 Nov 2021 13:17:06 +0000 Subject: [PATCH] Suggest using `/etc/matrix-synapse/conf.d/` for configuration with Debian packages (#11281) --- changelog.d/11281.doc | 1 + docs/setup/installation.md | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 changelog.d/11281.doc diff --git a/changelog.d/11281.doc b/changelog.d/11281.doc new file mode 100644 index 0000000000..ab27ed193c --- /dev/null +++ b/changelog.d/11281.doc @@ -0,0 +1 @@ +Suggest users of the Debian packages add configuration to `/etc/matrix-synapse/conf.d/` to prevent, upon upgrade, being asked to choose between their configuration and the maintainer's. diff --git a/docs/setup/installation.md b/docs/setup/installation.md index 3e08024441..16562be953 100644 --- a/docs/setup/installation.md +++ b/docs/setup/installation.md @@ -76,6 +76,12 @@ The fingerprint of the repository signing key (as shown by `gpg /usr/share/keyrings/matrix-org-archive-keyring.gpg`) is `AAF9AE843A7584B5A3E4CD2BCF45A512DE2DA058`. +When installing with Debian packages, you might prefer to place files in +`/etc/matrix-synapse/conf.d/` to override your configuration without editing +the main configuration file at `/etc/matrix-synapse/homeserver.yaml`. +By doing that, you won't be asked if you want to replace your configuration +file when you upgrade the Debian package to a later version. + ##### Downstream Debian packages We do not recommend using the packages from the default Debian `buster`