summary refs log tree commit diff
path: root/nixos/doc/manual/release-notes/rl-2003.xml
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2020-03-15 16:58:50 +0100
committerMaximilian Bosch <maximilian@mbosch.me>2020-03-16 10:39:42 +0100
commit849e16888f439d98ba99c6a67123033edaa56663 (patch)
tree43c0127835056786224e0e8b5c0e6b552d9c1e17 /nixos/doc/manual/release-notes/rl-2003.xml
parent8be61f7a36f403c15e1a242e129be7375aafaa85 (diff)
downloadnixpkgs-849e16888f439d98ba99c6a67123033edaa56663.tar
nixpkgs-849e16888f439d98ba99c6a67123033edaa56663.tar.gz
nixpkgs-849e16888f439d98ba99c6a67123033edaa56663.tar.bz2
nixpkgs-849e16888f439d98ba99c6a67123033edaa56663.tar.lz
nixpkgs-849e16888f439d98ba99c6a67123033edaa56663.tar.xz
nixpkgs-849e16888f439d98ba99c6a67123033edaa56663.tar.zst
nixpkgs-849e16888f439d98ba99c6a67123033edaa56663.zip
nixos/doc/matrix-synapse: refactor
* Linkify all service options used in the code-examples.
* Demonstrated the use of `riot-web.override {}`.
* Moved the example how to configure a postgresql-database for
  `matrix-synapse` to this document from the 20.03 release-notes.
Diffstat (limited to 'nixos/doc/manual/release-notes/rl-2003.xml')
-rw-r--r--nixos/doc/manual/release-notes/rl-2003.xml19
1 files changed, 4 insertions, 15 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 18cb1e4c314..20f232c9110 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -746,21 +746,10 @@ auth required pam_succeed_if.so uid >= 1000 quiet
 }</programlisting>
       </para></listitem>
       <listitem><para>If you deploy a fresh <package>matrix-synapse</package>, you need to configure
-       the database yourself. An example for this can be found in <literal>&lt;nixpkgs/nixos/tests/matrix-synapse.nix&gt;</literal>:
-<programlisting>{ ... }: {
-  services.matrix-synapse = {
-   <link linkend="opt-services.matrix-synapse.enable">enable</link> = true;
-   /* and all the other config you've defined here */
-  };
-  <link linkend="opt-services.postgresql.enable">services.postgresql.enable</link> = true;
-  <link linkend="opt-services.postgresql.initialScript">services.postgresql.initialScript</link> = ''
-    CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse';
-    CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
-      TEMPLATE template0
-      LC_COLLATE = "C"
-      LC_CTYPE = "C";
-  '';
-}</programlisting>
+       the database yourself (e.g. by using the
+       <link linkend="opt-services.postgresql.initialScript">services.postgresql.initialScript</link>
+       option). An example for this can be found in the
+       <link linkend="module-services-matrix">documentation of the Matrix module</link>.
       </para></listitem>
       <listitem><para>If you initially deployed your <package>matrix-synapse</package> on
        <literal>nixos-unstable</literal> <emphasis>after</emphasis> the <literal>19.09</literal>-release,