aboutsummaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-01-10 12:44:31 +0000
committerlain <lain@soykaf.club>2020-01-10 12:44:31 +0000
commit1629fa2412b877f69c5cf0df09782227827b272b (patch)
tree054cfc99e789cffc1ca51d6ce3a51e37a0cdf7a6 /config/config.exs
parentecb3386f939de3ffba16f9419994a009f2e59ded (diff)
parente372917f6c7963f4e1358ccc3c1ebeb7be9edfad (diff)
downloadpleroma-1.1.8.tar.gz
Merge branch 'release/1.1.8' into 'stable'v1.1.8
Release/1.1.8 See merge request pleroma/pleroma!2096
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index d2f081dd8..a5d0fb11c 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -53,9 +53,11 @@ config :pleroma, Pleroma.Repo,
config :pleroma, Pleroma.Captcha,
enabled: true,
- seconds_valid: 60,
+ seconds_valid: 300,
method: Pleroma.Captcha.Native
+config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
+
config :pleroma, :hackney_pools,
federation: [
max_connections: 50,