diff options
| author | lambda <lain@soykaf.club> | 2019-04-08 09:08:18 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-04-08 09:08:18 +0000 |
| commit | b177e1e7f330ff1531be190949db7f75e378a449 (patch) | |
| tree | 7f94c2927d254a358c5b73385b871ad6bc6beee4 /config | |
| parent | fb2040d06199f2f4190ff363da54d6fcfa87ff69 (diff) | |
| parent | 2056efa714460faaf25f6bc03ab643f5a2e8cd3d (diff) | |
| download | pleroma-b177e1e7f330ff1531be190949db7f75e378a449.tar.gz pleroma-b177e1e7f330ff1531be190949db7f75e378a449.zip | |
Merge branch 'scheduled-activities' into 'develop'
Scheduled activities
See merge request pleroma/pleroma!989
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 8 | ||||
| -rw-r--r-- | config/test.exs | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 61e799f33..8a977ece5 100644 --- a/config/config.exs +++ b/config/config.exs @@ -361,7 +361,8 @@ config :pleroma, Pleroma.Web.Federator.RetryQueue, config :pleroma_job_queue, :queues, federator_incoming: 50, federator_outgoing: 50, - mailer: 10 + mailer: 10, + scheduled_activities: 10 config :pleroma, :fetch_initial_posts, enabled: false, @@ -392,6 +393,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" diff --git a/config/test.exs b/config/test.exs index 6a7b9067e..894fa8d3d 100644 --- a/config/test.exs +++ b/config/test.exs @@ -50,6 +50,11 @@ config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock config :pleroma_job_queue, disabled: true +config :pleroma, Pleroma.ScheduledActivity, + daily_user_limit: 2, + total_user_limit: 3, + enabled: false + try do import_config "test.secret.exs" rescue |