Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned...

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 34b516e02f983eedacf96bb6caf9a11948b966ad..4f4e2368a4970749910c7910a2516b2c6250b760 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -91,6 +91,12 @@ config :logger, :console,
   format: "$time $metadata[$level] $message\n",
   metadata: [:request_id]
 
+config :logger, :ex_syslogger,
+  level: :debug,
+  ident: "Pleroma",
+  format: "$date $time $metadata[$level] $message",
+  metadata: [:request_id]
+
 config :mime, :types, %{
   "application/xml" => ["xml"],
   "application/xrd+xml" => ["xrd+xml"],
@@ -131,7 +137,8 @@ config :pleroma, :instance,
     "text/markdown"
   ],
   finmoji_enabled: true,
-  mrf_transparency: true
+  mrf_transparency: true,
+  autofollowed_nicknames: []
 
 config :pleroma, :markup,
   # XXX - unfortunately, inline images must be enabled by default right now, because
@@ -186,13 +193,7 @@ config :pleroma, :mrf_simple,
   reject: [],
   accept: []
 
-config :pleroma, :media_proxy,
-  enabled: false,
-  # base_url: "https://cache.pleroma.social",
-  proxy_opts: [
-    # inline_content_types: [] | false | true,
-    # http: [:insecure]
-  ]
+config :pleroma, :media_proxy, enabled: false
 
 config :pleroma, :chat, enabled: true