summaryrefslogtreecommitdiff
path: root/config/description.exs
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-10-19 15:40:03 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-10-19 15:40:03 +0400
commit76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f (patch)
treeffc5e72a54b1fe1289038e934fb20eb6c1431b4f /config/description.exs
parent2b58b0dbce36042a8acbb41a8ddc8696d2e00d0e (diff)
parent0495a07dc77d81abf46cbe166ae3fec14f705809 (diff)
downloadpleroma-76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f.tar.gz
pleroma-76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f.zip
Merge branch 'develop' into mutes-blocks-pagination
Diffstat (limited to 'config/description.exs')
-rw-r--r--config/description.exs14
1 files changed, 14 insertions, 0 deletions
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]
+ }
+ ]
}
]