Merge branch 'develop' into feature/gen-magic

[akkoma] / config / description.exs

diff --git a/config/description.exs b/config/description.exs
index 1253944de67b7253380ee90e7522d6e7f4ebc07a..d05adf88be5c218b3c745dfce3ca1ca78d156da3 100644 (file)
--- a/config/description.exs
+++ b/config/description.exs
@@ -2480,6 +2480,12 @@ config :pleroma, :config_description, [
         key: :enabled,
         type: :boolean,
         description: "Enables expired activities addition & deletion"
+      },
+      %{
+        key: :min_lifetime,
+        type: :integer,
+        description: "Minimum lifetime for ephemeral activity (in seconds)",
+        suggestions: [600]
       }
     ]
   },
@@ -3649,5 +3655,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]
+      }
+    ]
   }
 ]