aboutsummaryrefslogtreecommitdiff
path: root/docs/configuration/cheatsheet.md
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-12-12 18:43:21 +0000
committerlain <lain@soykaf.club>2019-12-12 18:43:21 +0000
commit2f31cef71f377cf660f818e7e204436f2070bd78 (patch)
tree7c41977bdc6512918ec79073e94c4d362ea783bf /docs/configuration/cheatsheet.md
parent8ad6d2784c0b79a50346dfd45fe3f3c0997b3d06 (diff)
parent470a3a678dfb4a7b9c2fe29c6b7ea03cee35ee82 (diff)
downloadpleroma-2f31cef71f377cf660f818e7e204436f2070bd78.tar.gz
Merge branch 'feature/native-captcha' into 'develop'
Add native captcha and enable it by default. Closes #1017 and #1405 See merge request pleroma/pleroma!2060
Diffstat (limited to 'docs/configuration/cheatsheet.md')
-rw-r--r--docs/configuration/cheatsheet.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index ef2711e3c..ce2a14210 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -379,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.