Switch UNIX socket paths to /run, and add a UNIX socket example for HAProxy (#16700)

pull/16729/head
villepeh 2023-12-04 14:38:46 +02:00 committed by GitHub
parent 15c46cf86a
commit 0aa4d3b6f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 9 deletions

1
changelog.d/16700.doc Normal file
View File

@ -0,0 +1 @@
Switch the example UNIX socket paths to /run. Add HAProxy example configuration for UNIX sockets.

View File

@ -181,7 +181,11 @@ frontend matrix-federation
backend matrix backend matrix
server matrix 127.0.0.1:8008 server matrix 127.0.0.1:8008
``` ```
Example configuration, if using a UNIX socket. The configuration lines regarding the frontends do not need to be modified.
```
backend matrix
server matrix unix@/run/synapse/main_public.sock
```
[Delegation](delegate.md) example: [Delegation](delegate.md) example:
``` ```

View File

@ -566,7 +566,7 @@ listeners:
# Note that x_forwarded will default to true, when using a UNIX socket. Please see # Note that x_forwarded will default to true, when using a UNIX socket. Please see
# https://matrix-org.github.io/synapse/latest/reverse_proxy.html. # https://matrix-org.github.io/synapse/latest/reverse_proxy.html.
# #
- path: /var/run/synapse/main_public.sock - path: /run/synapse/main_public.sock
type: http type: http
resources: resources:
- names: [client, federation] - names: [client, federation]
@ -4218,9 +4218,9 @@ Example configuration(#2, for UNIX sockets):
```yaml ```yaml
instance_map: instance_map:
main: main:
path: /var/run/synapse/main_replication.sock path: /run/synapse/main_replication.sock
worker1: worker1:
path: /var/run/synapse/worker1_replication.sock path: /run/synapse/worker1_replication.sock
``` ```
--- ---
### `stream_writers` ### `stream_writers`
@ -4406,13 +4406,13 @@ Example configuration(#2, using UNIX sockets with a `replication` listener):
```yaml ```yaml
worker_listeners: worker_listeners:
- type: http - type: http
path: /var/run/synapse/worker_public.sock path: /run/synapse/worker_replication.sock
resources:
- names: [client, federation]
- type: http
path: /var/run/synapse/worker_replication.sock
resources: resources:
- names: [replication] - names: [replication]
- type: http
path: /run/synapse/worker_public.sock
resources:
- names: [client, federation]
``` ```
--- ---
### `worker_manhole` ### `worker_manhole`