diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-12-19 12:16:33 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-12-19 12:16:33 -0600 |
| commit | 50638525db6bf7d59c4a5820848c9f6773cc49e1 (patch) | |
| tree | 6d94f34ddd482d57178107076a7e2f44698a3e43 /config | |
| parent | df469b4468168cf072e73df73e0fdde2bbab1da5 (diff) | |
| parent | 38ad407395e838ddf1c11922806adc080af44d36 (diff) | |
| download | pleroma-50638525db6bf7d59c4a5820848c9f6773cc49e1.tar.gz pleroma-50638525db6bf7d59c4a5820848c9f6773cc49e1.zip | |
Merge branch 'develop' into config/benchmark
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, |