diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-17 17:53:47 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-17 17:53:47 +0300 |
| commit | 9ea31b373fdb75bb6aa04d006e5f493158897efa (patch) | |
| tree | b7301d21a9bc675984bb11b40c96148c0205270e /config | |
| parent | a859d9bc15cd1e4ff15bb63d6c114f71783118ef (diff) | |
| parent | 023f726d7f497705d766adee8874b94efb08a0aa (diff) | |
| download | pleroma-9ea31b373fdb75bb6aa04d006e5f493158897efa.tar.gz pleroma-9ea31b373fdb75bb6aa04d006e5f493158897efa.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/description.exs | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 3d1f4d4ba..124f30a77 100644 --- a/config/config.exs +++ b/config/config.exs @@ -801,6 +801,8 @@ config :pleroma, :hackney_pools, timeout: 300_000 ] +config :pleroma, :majic_pool, size: 2 + private_instance? = :if_instance_is_private config :pleroma, :restrict_unauthenticated, diff --git a/config/description.exs b/config/description.exs index 6e83a8e09..2a1898922 100644 --- a/config/description.exs +++ b/config/description.exs @@ -3708,5 +3708,19 @@ config :pleroma, :config_description, [ ] } ] + }, + %{ + group: :pleroma, + key: :majic_pool, + type: :group, + description: "Majic/libmagic configuration", + children: [ + %{ + key: :size, + type: :integer, + description: "Number of majic workers to start.", + suggestions: [2] + } + ] } ] |