diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-05 08:33:39 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-05 08:33:39 +0200 |
commit | 866c5aa090d8f4c7f6e1b983531b7b8be4d354ac (patch) | |
tree | 0e4eb93b126a8d8fe60413b0fa20176d2791add6 /nixos/modules/services | |
parent | 95419ade3e8bbe9b0bcfc7d7e6f25c23d5a0b21b (diff) | |
parent | f601ab37c2fb7e5f65989a92df383bcd6942567a (diff) |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/services')
-rw-r--r-- | nixos/modules/services/misc/matrix-synapse.nix | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index d02fa13bb99c..703bc9416f88 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -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; |