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

Merge branch 'captcha' into 'develop'

Browse source 
Captcha

See merge request pleroma/pleroma!550
This commit is contained in:
lambda 2018-12-17 19:45:14 +00:00
commit 52ac7dce5c
12 changed files with 287 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
config/config.exs
View file

@ -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,