hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'captcha' into 'develop'

Browse source 
Make captcha (kocaptcha) stateless

See merge request pleroma/pleroma!585
This commit is contained in:
rinpatch 2019-01-03 17:04:27 +00:00
commit b73a1a33de
10 changed files with 127 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/config.exs
View file

@ -12,7 +12,7 @@ config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
config :pleroma, Pleroma.Captcha,
enabled: false,
seconds_retained: 180,
seconds_valid: 60,
method: Pleroma.Captcha.Kocaptcha
config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"

3
config/test.exs
View file

@ -9,7 +9,8 @@ config :pleroma, Pleroma.Web.Endpoint,
# Disable captha for tests
config :pleroma, Pleroma.Captcha,
enabled: true,
# It should not be enabled for automatic tests
enabled: false,
# A fake captcha service for tests
method: Pleroma.Captcha.Mock