Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 124f30a77b3cc6713f3901b007b2f7a10f5e7cd8..c52ee8f82407f23b8ba1eaecde5f185b74dd7f6b 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -234,6 +234,7 @@ config :pleroma, :instance,
     "text/bbcode"
   ],
   autofollowed_nicknames: [],
+  autofollowing_nicknames: [],
   max_pinned_statuses: 1,
   attachment_links: false,
   max_report_comment_size: 1000,
@@ -635,7 +636,12 @@ config :pleroma, Pleroma.Emails.UserEmail,
 
 config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: false
 
-config :prometheus, Pleroma.Web.Endpoint.MetricsExporter, path: "/api/pleroma/app_metrics"
+config :prometheus, Pleroma.Web.Endpoint.MetricsExporter,
+  enabled: false,
+  auth: false,
+  ip_whitelist: [],
+  path: "/api/pleroma/app_metrics",
+  format: :text
 
 config :pleroma, Pleroma.ScheduledActivity,
   daily_user_limit: 25,