Skip to content

Commit 9fad223

Browse files
committed
matrix-synapse: fix release notes and doc for NixOS#158605 changes
1 parent 605f21e commit 9fad223

File tree

3 files changed

+25
-7
lines changed

3 files changed

+25
-7
lines changed

nixos/doc/manual/from_md/release-notes/rl-2205.section.xml

+15-2
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,12 @@
432432
still supported, because you can set arbitrary values in this
433433
freeform type.
434434
</para>
435+
<para>
436+
The <literal>listeners.*.bind_address</literal> option was
437+
renamed to <literal>bind_addresses</literal> in order to match
438+
the upstream <literal>homeserver.yaml</literal> option name.
439+
It is now also a list of strings instead of a string.
440+
</para>
435441
<para>
436442
An example to make the required migration clearer:
437443
</para>
@@ -493,7 +499,7 @@
493499

494500
listeners = [ {
495501
port = 8448;
496-
bind_address = [
502+
bind_addresses = [
497503
&quot;::&quot;
498504
&quot;0.0.0.0&quot;
499505
];
@@ -524,7 +530,14 @@
524530
Additionally a few option defaults have been synced up with
525531
upstream default values, for example the
526532
<literal>max_upload_size</literal> grew from
527-
<literal>10M</literal> to <literal>50M</literal>.
533+
<literal>10M</literal> to <literal>50M</literal>. For the same
534+
reason, the default <literal>media_store_path</literal> was
535+
changed from <literal>${dataDir}/media</literal> to
536+
<literal>${dataDir}/media_store</literal> if
537+
<literal>system.stateVersion</literal> is at least
538+
<literal>22.05</literal>. Files will need to be manually moved
539+
to the new location if the <literal>stateVersion</literal> is
540+
updated.
528541
</para>
529542
</listitem>
530543
<listitem>

nixos/doc/manual/release-notes/rl-2205.section.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@ In addition to numerous new and upgraded packages, this release has the followin
141141
module (`services.matrix-synapse`) now need to be moved into `services.matrix-synapse.settings`. And while not all options you
142142
may use are defined in there, they are still supported, because you can set arbitrary values in this freeform type.
143143

144+
The `listeners.*.bind_address` option was renamed to `bind_addresses` in order to match the upstream `homeserver.yaml` option
145+
name. It is now also a list of strings instead of a string.
146+
144147
An example to make the required migration clearer:
145148

146149
Before:
@@ -198,7 +201,7 @@ In addition to numerous new and upgraded packages, this release has the followin
198201
199202
listeners = [ {
200203
port = 8448;
201-
bind_address = [
204+
bind_addresses = [
202205
"::"
203206
"0.0.0.0"
204207
];
@@ -223,7 +226,9 @@ In addition to numerous new and upgraded packages, this release has the followin
223226

224227
The secrets in your original config should be migrated into a YAML file that is included via `extraConfigFiles`.
225228

226-
Additionally a few option defaults have been synced up with upstream default values, for example the `max_upload_size` grew from `10M` to `50M`.
229+
Additionally a few option defaults have been synced up with upstream default values, for example the `max_upload_size` grew from `10M` to `50M`. For the same reason, the default
230+
`media_store_path` was changed from `${dataDir}/media` to `${dataDir}/media_store` if `system.stateVersion` is at least `22.05`. Files will need to be manually moved to the new
231+
location if the `stateVersion` is updated.
227232

228233
- The MoinMoin wiki engine (`services.moinmoin`) has been removed, because Python 2 is being retired from nixpkgs.
229234

nixos/modules/services/matrix/matrix-synapse.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ in {
119119
<link linkend="opt-services.matrix-synapse.settings.listeners">listeners</link> = [
120120
{
121121
<link linkend="opt-services.matrix-synapse.settings.listeners._.port">port</link> = 8008;
122-
<link linkend="opt-services.matrix-synapse.settings.listeners._.bind_addresses">bind_address</link> = [ "::1" ];
122+
<link linkend="opt-services.matrix-synapse.settings.listeners._.bind_addresses">bind_addresses</link> = [ "::1" ];
123123
<link linkend="opt-services.matrix-synapse.settings.listeners._.type">type</link> = "http";
124124
<link linkend="opt-services.matrix-synapse.settings.listeners._.tls">tls</link> = false;
125125
<link linkend="opt-services.matrix-synapse.settings.listeners._.x_forwarded">x_forwarded</link> = true;
@@ -152,10 +152,10 @@ in {
152152

153153
<para>
154154
If you want to run a server with public registration by anybody, you can
155-
then enable <literal><link linkend="opt-services.matrix-synapse.settings.enable_registration">services.matrix-synapse.enable_registration</link> =
155+
then enable <literal><link linkend="opt-services.matrix-synapse.settings.enable_registration">services.matrix-synapse.settings.enable_registration</link> =
156156
true;</literal>. Otherwise, or you can generate a registration secret with
157157
<command>pwgen -s 64 1</command> and set it with
158-
<option><link linkend="opt-services.matrix-synapse.settings.registration_shared_secret">services.matrix-synapse.registration_shared_secret</link></option>.
158+
<option><link linkend="opt-services.matrix-synapse.settings.registration_shared_secret">services.matrix-synapse.settings.registration_shared_secret</link></option>.
159159
To create a new user or admin, run the following after you have set the secret
160160
and have rebuilt NixOS:
161161
<screen>

0 commit comments

Comments
 (0)