From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Tue, 11 Feb 2020 09:54:55 +0000 (+0400)
Subject: Merge branch 'develop' into feature/new-registrations-digest
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6875ccb6bfcc5ae62db26d38c3d5eac4c6f8706a;p=akkoma

Merge branch 'develop' into feature/new-registrations-digest
---

6875ccb6bfcc5ae62db26d38c3d5eac4c6f8706a
diff --cc config/config.exs
index 70b3b87a4,41c1ff637..06ae2f262
--- a/config/config.exs
+++ b/config/config.exs
@@@ -501,11 -480,13 +480,15 @@@ config :pleroma, Oban
      transmogrifier: 20,
      scheduled_activities: 10,
      background: 5,
 -    attachments_cleanup: 5
 +    attachments_cleanup: 5,
 +    new_users_digest: 1
    ],
    crontab: [
+     {"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker},
+     {"0 * * * *", Pleroma.Workers.Cron.StatsWorker},
+     {"* * * * *", Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker},
 -    {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker}
++    {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker},
 +    {"0 0 * * *", Pleroma.Workers.NewUsersDigestWorker}
    ]
  
  config :pleroma, :workers,