diff options
| author | href <href@random.sh> | 2020-06-16 15:11:45 +0200 |
|---|---|---|
| committer | href <href@random.sh> | 2020-06-16 15:27:27 +0200 |
| commit | f124f6820582d50be83ba7a1709b14ce8ee1abcc (patch) | |
| tree | b263c9f9c957e4502695a648dd4b2bd5dd951fea /config | |
| parent | ec1452fd1cdb9cb1db9b8bad872916d3213489e2 (diff) | |
| download | pleroma-f124f6820582d50be83ba7a1709b14ce8ee1abcc.tar.gz pleroma-f124f6820582d50be83ba7a1709b14ce8ee1abcc.zip | |
Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/description.exs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs index 65aa8643e..f58b99faa 100644 --- a/config/config.exs +++ b/config/config.exs @@ -678,7 +678,7 @@ config :pleroma, :hackney_pools, timeout: 300_000 ] -config :pleroma, :gen_magic_pool, size: 2 +config :pleroma, :majic_pool, size: 2 config :pleroma, :restrict_unauthenticated, timelines: %{local: false, federated: false}, diff --git a/config/description.exs b/config/description.exs index a318afbe6..2afc5e366 100644 --- a/config/description.exs +++ b/config/description.exs @@ -3328,14 +3328,14 @@ config :pleroma, :config_description, [ }, %{ group: :pleroma, - key: :gen_magic_pool, + key: :majic_pool, type: :group, - description: "GenMagic/libmagic configuration", + description: "Majic/libmagic configuration", children: [ %{ key: :size, type: :integer, - description: "Number of gen_magic workers to start.", + description: "Number of majic workers to start.", suggestions: [2] } ] |