master/synapse
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Document how merging config files works - see #11203 (#19243)

Browse Source 
---------

Signed-off-by: Andre Klärner <kandre@ak-online.be>
Co-authored-by: Olivier 'reivilibre <olivier@librepush.net>
This commit is contained in:
Andre Klärner 2025-12-01 17:05:07 +01:00 committed by GitHub
parent d435cfc125
commit c20dd888bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/19243.doc Normal file
View File

@ -0,0 +1 @@
Document in the `--config-path` help how multiple files are merged - by merging them shallowly.

3
synapse/config/_base.py
View File

@ -672,7 +672,8 @@ class RootConfig:
action="append", action="append",
metavar="CONFIG_FILE", metavar="CONFIG_FILE",
help="Specify config file. Can be given multiple times and" help="Specify config file. Can be given multiple times and"
" may specify directories containing *.yaml files.", " may specify directories containing *.yaml files."
" Top-level keys in later files overwrite ones in earlier files.",
) )
parser.add_argument( parser.add_argument(
"--no-secrets-in-config", "--no-secrets-in-config",