summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-08-20 15:27:08 +0100
committerErik Johnston <erik@matrix.org>2019-08-21 10:44:58 +0100
commit5906be858900e134d99dd94f0ca9e8bd1db14c05 (patch)
tree06e0b9df39e70d44d9734465dccf48f74d03a69d /docs
parentRefactor the Appservice scheduler code (#5886) (diff)
downloadsynapse-5906be858900e134d99dd94f0ca9e8bd1db14c05.tar.xz
Add config option for keys to use to sign keys
This allows servers to separate keys that are used to sign remote keys
when acting as a notary server.
Diffstat (limited to 'docs')
-rw-r--r--docs/sample_config.yaml8
1 files changed, 8 insertions, 0 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index 0c6be30e51..c96eb0cf2d 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -1027,6 +1027,14 @@ signing_key_path: "CONFDIR/SERVERNAME.signing.key"
 #
 #trusted_key_servers:
 #  - server_name: "matrix.org"
+#
+
+# The additional signing keys to use when acting as a trusted key server, on
+# top of the normal signing keys.
+#
+# 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.