Merge branch 'bugfix/favicon-empty-test' into 'develop'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index d631c3962632dfd3d9aaeff0dcd54213622df04a..2426fbd52d081212921db25b8c15de6dada20920 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -735,28 +735,28 @@ config :pleroma, :connections_pool,
   max_connections: 250,
   max_idle_time: 30_000,
   retry: 0,
-  await_up_timeout: 5_000
+  connect_timeout: 5_000
 
 config :pleroma, :pools,
   federation: [
     size: 50,
     max_waiting: 10,
-    timeout: 10_000
+    recv_timeout: 10_000
   ],
   media: [
     size: 50,
     max_waiting: 10,
-    timeout: 10_000
+    recv_timeout: 10_000
   ],
   upload: [
     size: 25,
     max_waiting: 5,
-    timeout: 15_000
+    recv_timeout: 15_000
   ],
   default: [
     size: 10,
     max_waiting: 2,
-    timeout: 5_000
+    recv_timeout: 5_000
   ]
 
 config :pleroma, :hackney_pools,