diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-05-25 22:22:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-25 22:22:23 +0300 |
| commit | a28170c0a2e018c538508b7965a4a430399b1a32 (patch) | |
| tree | da163dae46bff33fcffbfb0a4e23afa10ddcf491 /nixos | |
| parent | 06aa417df3c06ea2aaa89a52a29b323558d81c8b (diff) | |
| parent | 9602964d5de9123bc31581fb196686e6988a742b (diff) | |
Merge pull request #233827 from NixOS/backport-232837-to-release-23.05
[Backport release-23.05] nixos/synapse: allow omitting `trusted_key_servers[].verify_keys`
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/matrix/synapse.nix | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix index 2a4104a4ec2bc..3dca3ff94f213 100644 --- a/nixos/modules/services/matrix/synapse.nix +++ b/nixos/modules/services/matrix/synapse.nix @@ -636,6 +636,7 @@ in { trusted_key_servers = mkOption { type = types.listOf (types.submodule { + freeformType = format.type; options = { server_name = mkOption { type = types.str; @@ -644,22 +645,6 @@ in { Hostname of the trusted server. ''; }; - - verify_keys = mkOption { - type = types.nullOr (types.attrsOf types.str); - default = null; - example = literalExpression '' - { - "ed25519:auto" = "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"; - } - ''; - description = lib.mdDoc '' - Attribute set from key id to base64 encoded public key. - - If specified synapse will check that the response is signed - by at least one of the given keys. - ''; - }; }; }); default = [ { |