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

reivilibre · web-flow · commit cd8b73aa97cb · 2023-07-03T11:39:52.000+01:00
* 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) &lt;oliverw@matrix.org&gt;

---------

Signed-off-by: Olivier Wilkinson (reivilibre) &lt;oliverw@matrix.org&gt;
diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,7 @@ __pycache__/
 /logs
 /media_store/
 /uploads
+/homeserver-config-overrides.d
 
 # For direnv users
 /.envrc
diff --git a/changelog.d/15854.misc b/changelog.d/15854.misc
@@ -0,0 +1 @@
+Fix the `devenv up` configuration which was ignoring the config overrides.
diff --git a/flake.nix b/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.
                 #

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix the `devenv up` configuration which was ignoring the config overrides.
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@`
`178`	`178`	`EOF`
`179`	`179`	`'';`
`180`	`180`	# Start synapse when `devenv up` is run.
`181`		`- processes.synapse.exec = "poetry run python -m synapse.app.homeserver -c homeserver.yaml --config-directory homeserver-config-overrides.d";`
	`181`	`+ processes.synapse.exec = "poetry run python -m synapse.app.homeserver -c homeserver.yaml -c homeserver-config-overrides.d";`
`182`	`182`
`183`	`183`	`# Define the perl modules we require to run SyTest.`
`184`	`184`	`#`