diff options
| author | lain <lain@soykaf.club> | 2020-11-04 16:18:11 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-11-04 16:18:11 +0100 |
| commit | bae48c98e32af6c43fa668771c6253f299d4bf8a (patch) | |
| tree | 0ceb2b31a2c65af23039e4074c51c495dd7dd8f8 /config/config.exs | |
| parent | 04b7505c75afbaa1f785b2adaf0313e9b0935fab (diff) | |
| parent | 4800ee656bbcd8fe21fe56531123d3a18eccc911 (diff) | |
| download | pleroma-bae48c98e32af6c43fa668771c6253f299d4bf8a.tar.gz pleroma-bae48c98e32af6c43fa668771c6253f299d4bf8a.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 5dc05599f..471f5d22a 100644 --- 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, @@ -551,6 +552,7 @@ config :pleroma, Oban, queues: [ activity_expiration: 10, token_expiration: 5, + backup: 1, federator_incoming: 50, federator_outgoing: 50, ingestion_queue: 50, @@ -636,7 +638,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, @@ -830,6 +837,11 @@ config :floki, :html_parser, Floki.HTMLParser.FastHtml config :pleroma, Pleroma.Web.Auth.Authenticator, Pleroma.Web.Auth.PleromaAuthenticator +config :pleroma, Pleroma.User.Backup, + purge_after_days: 30, + limit_days: 7, + dir: nil + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" |