Merge branch 'mfm' into develop

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 5cd085fe5f5e2febaf553a2f8406fd279cf7bc10..ad70966692b8d861e9a8b007178b908a2a808bf8 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -152,12 +152,12 @@ config :pleroma, Pleroma.Web.Endpoint,
 config :logger, truncate: 65536
 
 config :logger, :console,
-  level: :debug,
+  level: :info,
   format: "\n$time $metadata[$level] $message\n",
   metadata: [:request_id]
 
 config :logger, :ex_syslogger,
-  level: :debug,
+  level: :info,
   ident: "pleroma",
   format: "$metadata[$level] $message",
   metadata: [:request_id]
@@ -222,8 +222,10 @@ config :pleroma, :instance,
     "text/plain",
     "text/html",
     "text/markdown",
-    "text/bbcode"
+    "text/bbcode",
+    "text/x.misskeymarkdown"
   ],
+  staff_transparency: [],
   autofollowed_nicknames: [],
   autofollowing_nicknames: [],
   max_pinned_statuses: 1,
@@ -859,6 +861,8 @@ config :pleroma, ConcurrentLimiter, [
   {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]}
 ]
 
+config :pleroma, :search, provider: Pleroma.Search.Builtin
+
 config :pleroma, :telemetry,
   slow_queries_logging: [
     enabled: false,