From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Tue, 18 Feb 2020 14:46:09 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=61d9f43e463a3b3b0c1e4b9c98c22e222797bd82;p=akkoma

Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
---

61d9f43e463a3b3b0c1e4b9c98c22e222797bd82
diff --cc config/config.exs
index 242355035,ccc0c4e52..cb1551c2a
--- a/config/config.exs
+++ b/config/config.exs
@@@ -495,8 -480,13 +481,14 @@@ config :pleroma, Oban
      transmogrifier: 20,
      scheduled_activities: 10,
      background: 5,
 +    remote_fetcher: 2,
      attachments_cleanup: 5
+   ],
+   crontab: [
+     {"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker},
+     {"0 * * * *", Pleroma.Workers.Cron.StatsWorker},
+     {"* * * * *", Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker},
+     {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker}
    ]
  
  config :pleroma, :workers,