From 6ab6e2aaae26743ee8dfd2a79a4dd505faa3bc2e Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 23 Sep 2020 10:40:28 +0100 Subject: [PATCH] Don't use key_id from dendrite.yaml as it is in matrix_key.pem --- dendrite-config.yaml | 3 --- internal/config/config_global.go | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dendrite-config.yaml b/dendrite-config.yaml index be0972e4a..8c7376923 100644 --- a/dendrite-config.yaml +++ b/dendrite-config.yaml @@ -38,9 +38,6 @@ global: # The path to the signing private key file, used to sign requests and events. private_key: matrix_key.pem - # A unique identifier for this private key. Must start with the prefix "ed25519:". - key_id: ed25519:auto - # How long a remote server can cache our server signing key before requesting it # again. Increasing this number will reduce the number of requests made by other # servers for our key but increases the period that a compromised key will be diff --git a/internal/config/config_global.go b/internal/config/config_global.go index 2b36da2f5..03f522be4 100644 --- a/internal/config/config_global.go +++ b/internal/config/config_global.go @@ -20,7 +20,7 @@ type Global struct { // An arbitrary string used to uniquely identify the PrivateKey. Must start with the // prefix "ed25519:". - KeyID gomatrixserverlib.KeyID `yaml:"key_id"` + KeyID gomatrixserverlib.KeyID `yaml:"-"` // How long a remote server can cache our server key for before requesting it again. // Increasing this number will reduce the number of requests made by remote servers