From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Tue, 3 Mar 2020 07:08:07 +0000 (+0300)
Subject: Merge branch 'develop' into gun
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=509c81e4b10bd8ba6d3a93889cd6fbbbfbcbab21;p=akkoma

Merge branch 'develop' into gun
---

509c81e4b10bd8ba6d3a93889cd6fbbbfbcbab21
diff --cc config/config.exs
index 82012dc10,2cd741213..7c94a0f26
--- a/config/config.exs
+++ b/config/config.exs
@@@ -602,51 -624,10 +602,53 @@@ config :pleroma, :modules, runtime_dir
  
  config :pleroma, configurable_from_database: false
  
- config :pleroma, Pleroma.Repo, parameters: [gin_fuzzy_search_limit: "500"]
+ config :pleroma, Pleroma.Repo,
+   parameters: [gin_fuzzy_search_limit: "500"],
+   prepare: :unnamed
  
 +config :pleroma, :connections_pool,
 +  receive_connection_timeout: 250,
 +  max_connections: 250,
 +  retry: 0,
 +  retry_timeout: 100,
 +  await_up_timeout: 5_000
 +
 +config :pleroma, :pools,
 +  federation: [
 +    size: 50,
 +    max_overflow: 10,
 +    timeout: 150_000
 +  ],
 +  media: [
 +    size: 50,
 +    max_overflow: 10,
 +    timeout: 150_000
 +  ],
 +  upload: [
 +    size: 25,
 +    max_overflow: 5,
 +    timeout: 300_000
 +  ],
 +  default: [
 +    size: 10,
 +    max_overflow: 2,
 +    timeout: 10_000
 +  ]
 +
 +config :pleroma, :hackney_pools,
 +  federation: [
 +    max_connections: 50,
 +    timeout: 150_000
 +  ],
 +  media: [
 +    max_connections: 50,
 +    timeout: 150_000
 +  ],
 +  upload: [
 +    max_connections: 25,
 +    timeout: 300_000
 +  ]
 +
  # 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"