Browse Source

Fix the `devenv up` configuration which was ignoring the config overrides. (#15854)

* Fix use of config override directory in `devenv up`

`--config-directory` is for the generate config script; `-c` is for usage

* Add homeserver config override directory to gitignore

* Newsfile

Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org>

---------

Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org>
reivilibre 10 months ago
parent
commit
cd8b73aa97
3 changed files with 3 additions and 1 deletions
  1. 1 0
      .gitignore
  2. 1 0
      changelog.d/15854.misc
  3. 1 1
      flake.nix

+ 1 - 0
.gitignore

@@ -34,6 +34,7 @@ __pycache__/
 /logs
 /media_store/
 /uploads
+/homeserver-config-overrides.d
 
 # For direnv users
 /.envrc

+ 1 - 0
changelog.d/15854.misc

@@ -0,0 +1 @@
+Fix the `devenv up` configuration which was ignoring the config overrides.

+ 1 - 1
flake.nix

@@ -178,7 +178,7 @@
                   EOF
                 '';
                 # Start synapse when `devenv up` is run.
-                processes.synapse.exec = "poetry run python -m synapse.app.homeserver -c homeserver.yaml --config-directory homeserver-config-overrides.d";
+                processes.synapse.exec = "poetry run python -m synapse.app.homeserver -c homeserver.yaml -c homeserver-config-overrides.d";
 
                 # Define the perl modules we require to run SyTest.
                 #