diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-21 20:37:29 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-21 20:38:59 +0300 |
| commit | 54c9db38c8035ecc115e136a09a3d991e426959a (patch) | |
| tree | 496afddf614e826c2c76c7d69e3968a3c118e717 /config/config.exs | |
| parent | 67cb46e15dd5fa16da257a9b0e5166266d10c694 (diff) | |
| parent | c51e93978ea2aa0f2d5bcc43bf7c925b2590eece (diff) | |
| download | pleroma-54c9db38c8035ecc115e136a09a3d991e426959a.tar.gz pleroma-54c9db38c8035ecc115e136a09a3d991e426959a.zip | |
Merge branch 'develop' into issue/1383
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index a737c98af..bbd8f7d78 100644 --- a/config/config.exs +++ b/config/config.exs @@ -56,6 +56,8 @@ config :pleroma, Pleroma.Captcha, seconds_valid: 60, method: Pleroma.Captcha.Native +config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" + config :pleroma, :hackney_pools, federation: [ max_connections: 50, @@ -609,6 +611,8 @@ config :pleroma, :web_cache_ttl, activity_pub: nil, activity_pub_question: 30_000 +config :pleroma, :modules, runtime_dir: "instance/modules" + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" |