Merge pull request #232837 from emilylange/nixos/synapse

nixos/synapse: allow omitting `trusted_key_servers[].verify_keys`
This commit is contained in:
Maximilian Bosch
2023-05-24 16:28:03 +02:00
committed by GitHub
+1 -16
View File
@@ -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 = [ {