diff options
| author | feld <feld@feld.me> | 2020-10-27 22:13:50 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-10-27 22:13:50 +0000 |
| commit | 03a318af9ac1cc86e1201d6f55babd06c0b5ecd9 (patch) | |
| tree | 1f45ec8d85a95ea677fc1e1a5e78f64e5241f36b /config/config.exs | |
| parent | e062329a177e1a1382cb3a44ef71e6d278b4963e (diff) | |
| parent | 7d31122781c27e11e9e4ab62290cb772d64472d4 (diff) | |
| download | pleroma-03a318af9ac1cc86e1201d6f55babd06c0b5ecd9.tar.gz pleroma-03a318af9ac1cc86e1201d6f55babd06c0b5ecd9.zip | |
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 14fecd9a9..c52ee8f82 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, |