chore: merge develop into ParadeDB backend
This commit is contained in:
commit
a9862dcaa0
171 changed files with 6675 additions and 824 deletions
|
|
@ -2726,6 +2726,19 @@ config :pleroma, :config_description, [
|
|||
}
|
||||
]
|
||||
},
|
||||
%{
|
||||
group: :pleroma,
|
||||
key: Pleroma.Chat,
|
||||
type: :group,
|
||||
description: "Pleroma Chat settings",
|
||||
children: [
|
||||
%{
|
||||
key: :enabled,
|
||||
type: :boolean,
|
||||
description: "Enables the chats API."
|
||||
}
|
||||
]
|
||||
},
|
||||
%{
|
||||
group: :pleroma,
|
||||
key: :http,
|
||||
|
|
@ -3085,9 +3098,16 @@ config :pleroma, :config_description, [
|
|||
%{
|
||||
key: :max_connections,
|
||||
type: :integer,
|
||||
description: "Maximum number of connections in the pool. Default: 250 connections.",
|
||||
description:
|
||||
"Maximum total number of connections in the pool. HTTP/1 origins may use multiple connections within this limit, while HTTP/2 connections are multiplexed. Default: 250 connections.",
|
||||
suggestions: [250]
|
||||
},
|
||||
%{
|
||||
key: :max_idle_time,
|
||||
type: :integer,
|
||||
description: "Time before an unused connection is closed. Default: 30000ms.",
|
||||
suggestions: [30_000]
|
||||
},
|
||||
%{
|
||||
key: :connect_timeout,
|
||||
type: :integer,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue