summaryrefslogtreecommitdiff
path: root/config/description.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-10-15 16:39:01 -0500
committerMark Felder <feld@FreeBSD.org>2020-10-15 16:39:01 -0500
commitfb056ce05b43841ce57135ffb0b25845c41639ef (patch)
treeedd3e47128b454ab721027b5c6f30d0bcc5bd27c /config/description.exs
parent724e4b7f00041667b9fa61fd1b7dd51c8eeaa102 (diff)
parent5703fb6d2a5f9fcffe050eadbc43758bcd2efa14 (diff)
downloadpleroma-fb056ce05b43841ce57135ffb0b25845c41639ef.tar.gz
pleroma-fb056ce05b43841ce57135ffb0b25845c41639ef.zip
Merge branch 'develop' into refactor/discoverable_user_field
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]
+ }
+ ]
}
]