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: 045384ac98ce
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5572974c0d1b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 4, 2020

  1. nixos/matrix-synapse: remove web_client option 

    Removed in matrix-synapse-0.34.
    @mmilata
    mmilata committed Apr 4, 2020
    Copy the full SHA
    2acddcb View commit details

  2. Merge pull request #81212 from mmilata/synapse-webclient 

    nixos/matrix-synapse: remove web_client option
    @Ma27
    Ma27 authored Apr 4, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5572974 View commit details
Showing with 1 addition and 8 deletions.
  1. +1 −8 nixos/modules/services/misc/matrix-synapse.nix
9 changes: 1 addition & 8 deletions nixos/modules/services/misc/matrix-synapse.nix
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,6 @@ bind_host: "${cfg.bind_host}"
''}
server_name: "${cfg.server_name}"
pid_file: "/run/matrix-synapse.pid"
web_client: ${boolToString cfg.web_client}
${optionalString (cfg.public_baseurl != null) ''
public_baseurl: "${cfg.public_baseurl}"
''}
@@ -202,13 +201,6 @@ in {
This is also the last part of your UserID.
'';
};
web_client = mkOption {
type = types.bool;
default = false;
description = ''
Whether to serve a web client from the HTTP/HTTPS root resource.
'';
};
public_baseurl = mkOption {
type = types.nullOr types.str;
default = null;
@@ -719,6 +711,7 @@ in {
Database configuration must be done manually. An exemplary setup is demonstrated in
<nixpkgs/nixos/tests/matrix-synapse.nix>
'')
(mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "")
];

meta.doc = ./matrix-synapse.xml;