Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0f920b05cbcd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c7153272cb19
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 16, 2020

  1. nixos/doc: fix database-setup example for matrix-synapse 

    Closes #85327

(cherry picked from commit 74d6e86)
    @Ma27
    Ma27 committed Apr 16, 2020
    Copy the full SHA
    c715327 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 nixos/modules/services/misc/matrix-synapse.xml
3 changes: 2 additions & 1 deletion nixos/modules/services/misc/matrix-synapse.xml
View file
Original file line number Diff line number Diff line change
@@ -33,6 +33,7 @@
<link xlink:href="https://github.com/matrix-org/synapse#synapse-installation">
installation instructions of Synapse </link>.
<programlisting>
{ pkgs, ... }:
let
fqdn =
let
@@ -46,7 +47,7 @@ in {
<link linkend="opt-networking.firewall.allowedTCPPorts">networking.firewall.allowedTCPPorts</link> = [ 80 443 ];

<link linkend="opt-services.postgresql.enable">services.postgresql.enable</link> = true;
<link linkend="opt-services.postgresql.initialScript">services.postgresql.initialScript</link> = ''
<link linkend="opt-services.postgresql.initialScript">services.postgresql.initialScript</link> = pkgs.writeText "synapse-init.sql" ''
CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse';
CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
TEMPLATE template0