summaryrefslogtreecommitdiff
path: root/config/config.md
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-12-17 19:45:14 +0000
committerlambda <pleromagit@rogerbraun.net>2018-12-17 19:45:14 +0000
commit52ac7dce5c460d27d946d26070eb123e89af2914 (patch)
tree0f1ac473ae10290bd13220552e2cce8db851f5d4 /config/config.md
parentc6d5f189d9847b0c23d8150f41c05d87402680eb (diff)
parentde981ac5a23673797951096b64a7f5ca49630467 (diff)
downloadpleroma-52ac7dce5c460d27d946d26070eb123e89af2914.tar.gz
pleroma-52ac7dce5c460d27d946d26070eb123e89af2914.zip
Merge branch 'captcha' into 'develop'
Captcha See merge request pleroma/pleroma!550
Diffstat (limited to 'config/config.md')
-rw-r--r--config/config.md14
1 files changed, 13 insertions, 1 deletions
diff --git a/config/config.md b/config/config.md
index 8282eab14..edabd6e0f 100644
--- a/config/config.md
+++ b/config/config.md
@@ -7,7 +7,7 @@ If you run Pleroma with ``MIX_ENV=prod`` the file is ``prod.secret.exs``, otherw
* `uploader`: Select which `Pleroma.Uploaders` to use
* `filters`: List of `Pleroma.Upload.Filter` to use.
* `base_url`: The base URL to access a user-uploaded file. Useful when you want to proxy the media files via another host.
-* `proxy_remote`: If you're using a remote uploader, Pleroma will proxy media requests instead of redirecting to it.
+* `proxy_remote`: If you\'re using a remote uploader, Pleroma will proxy media requests instead of redirecting to it.
* `proxy_opts`: Proxy options, see `Pleroma.ReverseProxy` documentation.
Note: `strip_exif` has been replaced by `Pleroma.Upload.Filter.Mogrify`.
@@ -163,3 +163,15 @@ Web Push Notifications configuration. You can use the mix task `mix web_push.gen
* ``subject``: a mailto link for the administrative contact. It’s best if this email is not a personal email address, but rather a group email so that if a person leaves an organization, is unavailable for an extended period, or otherwise can’t respond, someone else on the list can.
* ``public_key``: VAPID public key
* ``private_key``: VAPID private key
+
+## Pleroma.Captcha
+* `enabled`: Whether the captcha should be shown on registration
+* `method`: The method/service to use for captcha
+* `seconds_retained`: The time in seconds for which the captcha is valid (stored in the cache)
+
+### 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.
+
+* `endpoint`: the kocaptcha endpoint to use \ No newline at end of file