diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-10-19 15:40:03 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-10-19 15:40:03 +0400 |
| commit | 76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f (patch) | |
| tree | ffc5e72a54b1fe1289038e934fb20eb6c1431b4f /config | |
| parent | 2b58b0dbce36042a8acbb41a8ddc8696d2e00d0e (diff) | |
| parent | 0495a07dc77d81abf46cbe166ae3fec14f705809 (diff) | |
| download | pleroma-76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f.tar.gz pleroma-76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f.zip | |
Merge branch 'develop' into mutes-blocks-pagination
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 273da5bb6..2c6142360 100644 --- a/config/config.exs +++ b/config/config.exs @@ -802,6 +802,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] + } + ] } ] |