diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-08 16:46:59 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-08 16:46:59 +0700 |
| commit | c3d5c3513a3205313f0a2e28bb328ad5b48f2055 (patch) | |
| tree | 09ec548304cf3bbabba5a3b216c2d6769c9a6525 /config/config.exs | |
| parent | a1a854646e96598473ed7a323e034cf1f88ca508 (diff) | |
| parent | b177e1e7f330ff1531be190949db7f75e378a449 (diff) | |
| download | pleroma-c3d5c3513a3205313f0a2e28bb328ad5b48f2055.tar.gz pleroma-c3d5c3513a3205313f0a2e28bb328ad5b48f2055.zip | |
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 0a80287ae..7ca5d0c87 100644 --- a/config/config.exs +++ b/config/config.exs @@ -362,7 +362,8 @@ config :pleroma_job_queue, :queues, federator_incoming: 50, federator_outgoing: 50, web_push: 50, - mailer: 10 + mailer: 10, + scheduled_activities: 10 config :pleroma, :fetch_initial_posts, enabled: false, @@ -393,6 +394,11 @@ config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Sendmail config :prometheus, Pleroma.Web.Endpoint.MetricsExporter, path: "/api/pleroma/app_metrics" +config :pleroma, Pleroma.ScheduledActivity, + daily_user_limit: 25, + total_user_limit: 300, + enabled: true + # 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" |