diff options
| author | lain <lain@soykaf.club> | 2019-12-12 18:43:21 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-12-12 18:43:21 +0000 |
| commit | 2f31cef71f377cf660f818e7e204436f2070bd78 (patch) | |
| tree | 7c41977bdc6512918ec79073e94c4d362ea783bf /config | |
| parent | 8ad6d2784c0b79a50346dfd45fe3f3c0997b3d06 (diff) | |
| parent | 470a3a678dfb4a7b9c2fe29c6b7ea03cee35ee82 (diff) | |
| download | pleroma-2f31cef71f377cf660f818e7e204436f2070bd78.tar.gz pleroma-2f31cef71f377cf660f818e7e204436f2070bd78.zip | |
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 'config')
| -rw-r--r-- | config/config.exs | 6 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs index 6ed800056..370ddd855 100644 --- a/config/config.exs +++ b/config/config.exs @@ -66,9 +66,9 @@ config :pleroma, Pleroma.Scheduler, jobs: scheduled_jobs config :pleroma, Pleroma.Captcha, - enabled: false, + enabled: true, seconds_valid: 60, - method: Pleroma.Captcha.Kocaptcha + method: Pleroma.Captcha.Native config :pleroma, :hackney_pools, federation: [ @@ -84,8 +84,6 @@ config :pleroma, :hackney_pools, timeout: 300_000 ] -config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" - # Upload configuration config :pleroma, Pleroma.Upload, uploader: Pleroma.Uploaders.Local, diff --git a/config/test.exs b/config/test.exs index d52ced612..b48b89c8f 100644 --- a/config/test.exs +++ b/config/test.exs @@ -95,6 +95,8 @@ config :joken, default_signer: "yU8uHKq+yyAkZ11Hx//jcdacWc8yQ1bxAAGrplzB0Zwwjkp3 config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock +config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |