Unverified Commit 40dcc337 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge pull request #232837 from emilylange/nixos/synapse

nixos/synapse: allow omitting `trusted_key_servers[].verify_keys`
parents f9e87ebf d212ec13
Loading
Loading
Loading
Loading
+1 −16
Original line number Diff line number Diff line
@@ -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 = [ {