diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-12-17 12:36:56 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-12-17 12:36:56 +0300 |
| commit | 45180d4c6058f790475d8ff28018c912db105082 (patch) | |
| tree | b05758d7551ddfcc3b607538720f81db86b44ca9 /config | |
| parent | eb11c6028973b945361095d3f4791ac6f61379a9 (diff) | |
| parent | 38ad407395e838ddf1c11922806adc080af44d36 (diff) | |
| download | pleroma-45180d4c6058f790475d8ff28018c912db105082.tar.gz pleroma-45180d4c6058f790475d8ff28018c912db105082.zip | |
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 8 | ||||
| -rw-r--r-- | config/test.exs | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/config/config.exs b/config/config.exs index 6ed800056..47098858b 100644 --- a/config/config.exs +++ b/config/config.exs @@ -66,9 +66,11 @@ 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, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" config :pleroma, :hackney_pools, federation: [ @@ -84,8 +86,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 9b737d4d7..d52ced612 100644 --- a/config/test.exs +++ b/config/test.exs @@ -68,7 +68,9 @@ config :pleroma, Oban, queues: false, prune: :disabled -config :pleroma, Pleroma.Scheduler, jobs: [] +config :pleroma, Pleroma.Scheduler, + jobs: [], + global: false config :pleroma, Pleroma.ScheduledActivity, daily_user_limit: 2, |