diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2023-05-24 16:28:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-24 16:28:03 +0200 |
| commit | 40dcc3375cdcb25c01feba90157fe70e390d6f0e (patch) | |
| tree | 81b32e86b637cdad4d1d0195256be07cc6a10cce /nixos | |
| parent | f9e87ebfe379da3af48a490a9b082c8dd9b253ca (diff) | |
| parent | d212ec13b8907f631606f0130f6cd73e10b95285 (diff) | |
| download | nixlib-40dcc3375cdcb25c01feba90157fe70e390d6f0e.tar nixlib-40dcc3375cdcb25c01feba90157fe70e390d6f0e.tar.gz nixlib-40dcc3375cdcb25c01feba90157fe70e390d6f0e.tar.bz2 nixlib-40dcc3375cdcb25c01feba90157fe70e390d6f0e.tar.lz nixlib-40dcc3375cdcb25c01feba90157fe70e390d6f0e.tar.xz nixlib-40dcc3375cdcb25c01feba90157fe70e390d6f0e.tar.zst nixlib-40dcc3375cdcb25c01feba90157fe70e390d6f0e.zip | |
Merge pull request #232837 from emilylange/nixos/synapse
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 2a4104a4ec2b..3dca3ff94f21 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 = [ { |