Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Switch UNIX socket paths to /run, and add a UNIX socket example for H…
Browse files Browse the repository at this point in the history
…AProxy (#16700)
  • Loading branch information
villepeh authored Dec 4, 2023
1 parent 15c46cf commit 0aa4d3b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
1 change: 1 addition & 0 deletions changelog.d/16700.doc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Switch the example UNIX socket paths to /run. Add HAProxy example configuration for UNIX sockets.
6 changes: 5 additions & 1 deletion docs/reverse_proxy.md
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,11 @@ frontend matrix-federation
backend matrix
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:
```
Expand Down
14 changes: 7 additions & 7 deletions docs/usage/configuration/config_documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ listeners:
# 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.
#
- path: /var/run/synapse/main_public.sock
- path: /run/synapse/main_public.sock
type: http
resources:
- names: [client, federation]
Expand Down Expand Up @@ -4218,9 +4218,9 @@ Example configuration(#2, for UNIX sockets):
```yaml
instance_map:
main:
path: /var/run/synapse/main_replication.sock
path: /run/synapse/main_replication.sock
worker1:
path: /var/run/synapse/worker1_replication.sock
path: /run/synapse/worker1_replication.sock
```
---
### `stream_writers`
Expand Down Expand Up @@ -4406,13 +4406,13 @@ Example configuration(#2, using UNIX sockets with a `replication` listener):
```yaml
worker_listeners:
- type: http
path: /var/run/synapse/worker_public.sock
path: /run/synapse/worker_replication.sock
resources:
- names: [client, federation]
- names: [replication]
- type: http
path: /var/run/synapse/worker_replication.sock
path: /run/synapse/worker_public.sock
resources:
- names: [replication]
- names: [client, federation]
```
---
### `worker_manhole`
Expand Down

0 comments on commit 0aa4d3b

Please sign in to comment.