diff options
| author | minibikini <egor@kislitsyn.com> | 2020-11-18 20:22:40 +0000 |
|---|---|---|
| committer | minibikini <egor@kislitsyn.com> | 2020-11-18 20:22:40 +0000 |
| commit | 6669ac5bf7749be325a10f92cc9eed49c6be2761 (patch) | |
| tree | 107cd84c2a05d80f684f7d7ec1608fb4f6d3c606 /docs/configuration | |
| parent | 1d03ba4ffbb73b54a7caa107a6b9a85fa65ecfd4 (diff) | |
| parent | a1056aace19d5f6201f06937a93f978917df8418 (diff) | |
| download | pleroma-6669ac5bf7749be325a10f92cc9eed49c6be2761.tar.gz | |
Merge branch 'develop' into 'hide-muted-reactions'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'docs/configuration')
| -rw-r--r-- | docs/configuration/cheatsheet.md | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index ebf95ebc9..4d18ac30a 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -220,18 +220,6 @@ config :pleroma, :mrf_user_allowlist, %{ * `total_user_limit`: the number of scheduled activities a user is allowed to create in total (Default: `300`) * `enabled`: whether scheduled activities are sent to the job queue to be executed -## FedSockets -FedSockets is an experimental feature allowing for Pleroma backends to federate using a persistant websocket connection as opposed to making each federation a seperate http connection. This feature is currently off by default. It is configurable throught he following options. - -### :fedsockets -* `enabled`: Enables FedSockets for this instance. `false` by default. -* `connection_duration`: Time an idle websocket is kept open. -* `rejection_duration`: Failures to connect via FedSockets will not be retried for this period of time. -* `fed_socket_fetches` and `fed_socket_rejections`: Settings passed to `cachex` for the fetch registry, and rejection stacks. See `Pleroma.Web.FedSockets` for more details. - - -## Frontends - ### :frontend_configurations This can be used to configure a keyword list that keeps the configuration data for any kind of frontend. By default, settings for `pleroma_fe` and `masto_fe` are configured. You can find the documentation for `pleroma_fe` configuration into [Pleroma-FE configuration and customization for instance administrators](/frontend/CONFIGURATION/#options). |