summaryrefslogtreecommitdiff
path: root/config/config.exs
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.exs
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.exs')
-rw-r--r--config/config.exs7
1 files changed, 7 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index df6ea09ae..036f1ac0b 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -10,6 +10,13 @@ config :pleroma, ecto_repos: [Pleroma.Repo]
config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
+config :pleroma, Pleroma.Captcha,
+ enabled: false,
+ seconds_retained: 180,
+ method: Pleroma.Captcha.Kocaptcha
+
+config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
+
# Upload configuration
config :pleroma, Pleroma.Upload,
uploader: Pleroma.Uploaders.Local,