diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-01-06 15:22:35 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-01-06 15:22:35 -0600 |
| commit | 1438fd958325c3d469315c478f06def9e4dd0de3 (patch) | |
| tree | 738e7e9ce8e0e0af89d9dff411191643cbf45aab /docs/configuration/cheatsheet.md | |
| parent | 2aeb229de3f59e1704c633c31415e7e834f6ba67 (diff) | |
| parent | 5e128a6be30563adc3b8a938aa68d18ac04cdfa0 (diff) | |
| download | pleroma-1438fd958325c3d469315c478f06def9e4dd0de3.tar.gz pleroma-1438fd958325c3d469315c478f06def9e4dd0de3.zip | |
Merge remote-tracking branch 'upstream/develop' into block-behavior
Diffstat (limited to 'docs/configuration/cheatsheet.md')
| -rw-r--r-- | docs/configuration/cheatsheet.md | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index 75cb4b348..07dc04fcd 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -63,6 +63,7 @@ To add configuration to your config file, you can copy it from the base config. * `external_user_synchronization`: Enabling following/followers counters synchronization for external users. * `cleanup_attachments`: Remove attachments along with statuses. Does not affect duplicate files and attachments without status. Enabling this will increase load to database when deleting statuses on larger instances. * `show_reactions`: Let favourites and emoji reactions be viewed through the API (default: `true`). +* `password_reset_token_validity`: The time after which reset tokens aren't accepted anymore, in seconds (default: one day). ## Welcome * `direct_message`: - welcome message sent as a direct message. @@ -221,18 +222,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). |