summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Eastwood <erice@element.io>2025-01-20 12:40:05 -0600
committerGitHub <noreply@github.com>2025-01-20 12:40:05 -0600
commit0a31cf18cd12003ec2ab2bd41d4e225cd1739e17 (patch)
tree3721e44fe4d4987855b2f493e92718d71dc3ce9e
parentDrop indices concurrently on background updates (#18091) (diff)
downloadsynapse-0a31cf18cd12003ec2ab2bd41d4e225cd1739e17.tar.xz
Document possibility of configuring `tls` for a worker instance in `instance_map` (#18064)
-rw-r--r--changelog.d/18064.doc1
-rw-r--r--docs/usage/configuration/config_documentation.md4
2 files changed, 5 insertions, 0 deletions
diff --git a/changelog.d/18064.doc b/changelog.d/18064.doc
new file mode 100644

index 0000000000..09f73c9b9b --- /dev/null +++ b/changelog.d/18064.doc
@@ -0,0 +1 @@ +Document `tls` option for a worker instance in `instance_map`. diff --git a/docs/usage/configuration/config_documentation.md b/docs/usage/configuration/config_documentation.md
index 74522a1e4e..64392366ca 100644 --- a/docs/usage/configuration/config_documentation.md +++ b/docs/usage/configuration/config_documentation.md
@@ -4465,6 +4465,10 @@ instance_map: worker1: host: localhost port: 8034 + other: + host: localhost + port: 8035 + tls: true ``` Example configuration(#2, for UNIX sockets): ```yaml