diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-17 09:24:08 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-17 09:24:08 +0300 |
| commit | a879c396bb3a07929d4821ef2c29610808962c6d (patch) | |
| tree | c0e64cdda3a4ab59d2fbdd25db65d8d795dba6c6 /docs/configuration | |
| parent | 22fc271e23a5dd1570ea7429b563f6edc42613c4 (diff) | |
| parent | 804b961d3c8e0034c7b6057a164126e5d01a084b (diff) | |
| download | pleroma-a879c396bb3a07929d4821ef2c29610808962c6d.tar.gz pleroma-a879c396bb3a07929d4821ef2c29610808962c6d.zip | |
Merge branch 'develop' into feature/tag_feed
Diffstat (limited to 'docs/configuration')
| -rw-r--r-- | docs/configuration/cheatsheet.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index dc2f55229..ce2a14210 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -12,6 +12,7 @@ You shouldn't edit the base config directly to avoid breakages and merge conflic * `notify_email`: Email used for notifications. * `description`: The instance’s description, can be seen in nodeinfo and ``/api/v1/instance``. * `limit`: Posts character limit (CW/Subject included in the counter). +* `chat_limit`: Character limit of the instance chat messages. * `remote_limit`: Hard character limit beyond which remote posts will be dropped. * `upload_limit`: File size limit of uploads (except for avatar, background, banner). * `avatar_upload_limit`: File size limit of user’s profile avatars. @@ -378,13 +379,19 @@ For each pool, the options are: ## Captcha ### Pleroma.Captcha + * `enabled`: Whether the captcha should be shown on registration. * `method`: The method/service to use for captcha. * `seconds_valid`: The time in seconds for which the captcha is valid. ### Captcha providers +#### Pleroma.Captcha.Native + +A built-in captcha provider. Enabled by default. + #### Pleroma.Captcha.Kocaptcha + Kocaptcha is a very simple captcha service with a single API endpoint, the source code is here: https://github.com/koto-bank/kocaptcha. The default endpoint `https://captcha.kotobank.ch` is hosted by the developer. |