summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-10-27 12:54:33 -0500
committerMark Felder <feld@FreeBSD.org>2020-10-27 12:54:33 -0500
commit291189357b2140db6d6ff1f51522e597690f9fb5 (patch)
treea70006be12fa1fa88f466692ea09ffb586da5353 /config/config.exs
parent9e54ef086b45c9df38eb293e4db2ea653261c83b (diff)
parent5aff4799515c141cb0a42686733b2f40faba6f86 (diff)
downloadpleroma-291189357b2140db6d6ff1f51522e597690f9fb5.tar.gz
pleroma-291189357b2140db6d6ff1f51522e597690f9fb5.zip
Merge branch 'develop' into feature/account-export
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs7
1 files changed, 6 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index 4adac435c..267ff2a3b 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -636,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,