Merge pull request #5895 from matrix-org/erikj/notary_key

Add config option to sign remote key query responses with a separate key.
This commit is contained in:
Erik Johnston 2019-08-27 11:51:37 +01:00 committed by GitHub
commit f5b50d0871
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 55 additions and 25 deletions

View file

@ -1027,6 +1027,14 @@ signing_key_path: "CONFDIR/SERVERNAME.signing.key"
#
#trusted_key_servers:
# - server_name: "matrix.org"
#
# The signing keys to use when acting as a trusted key server. If not specified
# defaults to the server signing key.
#
# Can contain multiple keys, one per line.
#
#key_server_signing_keys_path: "key_server_signing_keys.key"
# Enable SAML2 for registration and login. Uses pysaml2.