diff options
| author | feld <feld@feld.me> | 2020-10-14 17:31:45 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-10-14 17:31:45 +0000 |
| commit | 20137056900f97af34f4433858cbdf69be6c9840 (patch) | |
| tree | 4920c30700ae1a338eff5ce4ca9ca408cdc04bd9 /config | |
| parent | 9a85ec0da095933cbddfb1dae74d035723032399 (diff) | |
| parent | 40f3cdc030536d49c80fe7318ff43cd5ba011df4 (diff) | |
| download | pleroma-20137056900f97af34f4433858cbdf69be6c9840.tar.gz pleroma-20137056900f97af34f4433858cbdf69be6c9840.zip | |
Merge branch 'feature/gen-magic' into 'develop'
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
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] + } + ] } ] |