Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maunium
synapse
Commits
0aa4d3b6
Unverified
Commit
0aa4d3b6
authored
1 year ago
by
villepeh
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Switch UNIX socket paths to /run, and add a UNIX socket example for HAProxy (#16700)
parent
15c46cf8
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
changelog.d/16700.doc
+1
-0
1 addition, 0 deletions
changelog.d/16700.doc
docs/reverse_proxy.md
+5
-1
5 additions, 1 deletion
docs/reverse_proxy.md
docs/usage/configuration/config_documentation.md
+7
-7
7 additions, 7 deletions
docs/usage/configuration/config_documentation.md
with
13 additions
and
8 deletions
changelog.d/16700.doc
0 → 100644
+
1
−
0
View file @
0aa4d3b6
Switch the example UNIX socket paths to /run. Add HAProxy example configuration for UNIX sockets.
This diff is collapsed.
Click to expand it.
docs/reverse_proxy.md
+
5
−
1
View file @
0aa4d3b6
...
@@ -181,7 +181,11 @@ frontend matrix-federation
...
@@ -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:
```
```
...
...
This diff is collapsed.
Click to expand it.
docs/usage/configuration/config_documentation.md
+
7
−
7
View file @
0aa4d3b6
...
@@ -566,7 +566,7 @@ listeners:
...
@@ -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):
...
@@ -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):
...
@@ -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:
resources:
- names: [
client, feder
ation]
- names: [
replic
ation]
- type: http
- type: http
path:
/var
/run/synapse/worker_
replication
.sock
path: /run/synapse/worker_
public
.sock
resources:
resources:
- names: [
replic
ation]
- names: [
client, feder
ation]
```
```
---
---
### `
worker_manhole
`
### `
worker_manhole
`
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment