From: Maksim Pechnikov <parallel588@gmail.com>
Date: Wed, 22 Jan 2020 06:30:30 +0000 (+0300)
Subject: Merge branch 'develop' into issue/1383
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=b8d5c09f48a4b643f0dc60930bc69772a32a3b5e;p=akkoma

Merge branch 'develop' into issue/1383
---

b8d5c09f48a4b643f0dc60930bc69772a32a3b5e
diff --cc config/config.exs
index 8b8ecc833,9be1c721f..d706adc6e
--- a/config/config.exs
+++ b/config/config.exs
@@@ -488,13 -502,8 +488,14 @@@ config :pleroma, Oban
      mailer: 10,
      transmogrifier: 20,
      scheduled_activities: 10,
-     background: 5
+     background: 5,
+     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,