diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-10-14 12:33:24 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-10-14 12:33:24 -0500 |
| commit | 83770b7b391fdf8bdc22f63047b1cf444a7b16ce (patch) | |
| tree | bba3b4d867ee5cdc07165784868c28f174c10317 /config | |
| parent | 7d8f610720abdadeff9238aa8a345a91e473e0fa (diff) | |
| parent | 20137056900f97af34f4433858cbdf69be6c9840 (diff) | |
| download | pleroma-83770b7b391fdf8bdc22f63047b1cf444a7b16ce.tar.gz pleroma-83770b7b391fdf8bdc22f63047b1cf444a7b16ce.zip | |
Merge remote-tracking branch 'upstream/develop' into aliases
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] + } + ] } ] |