summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-09-10 19:17:15 +0000
committerrinpatch <rinpatch@sdf.org>2020-09-10 19:17:15 +0000
commit6316350918d1f55167fa384d55f385ff2c93e6bb (patch)
tree00f09310b3ea61a545906060efa7baace0b8378e /config/config.exs
parent0254696e30132f48e585154450aff87afb259e1d (diff)
parent82b56cdb9bc01dcf4dbd2ac0c06103af0900787d (diff)
downloadpleroma-6316350918d1f55167fa384d55f385ff2c93e6bb.tar.gz
pleroma-6316350918d1f55167fa384d55f385ff2c93e6bb.zip
Merge branch 'oban-overuse' into 'develop'
Expired activities as scheduled jobs in Oban See merge request pleroma/pleroma!2916
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs3
1 files changed, 1 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs
index 95a6ea9db..88c47fd03 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -544,7 +544,6 @@ config :pleroma, Oban,
],
plugins: [Oban.Plugins.Pruner],
crontab: [
- {"* * * * *", Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker},
{"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker},
{"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker}
]
@@ -655,7 +654,7 @@ config :pleroma, :rate_limit,
account_confirmation_resend: {8_640_000, 5},
ap_routes: {60_000, 15}
-config :pleroma, Pleroma.ActivityExpiration, enabled: true
+config :pleroma, Pleroma.Workers.PurgeExpiredActivity, enabled: true, min_lifetime: 600
config :pleroma, Pleroma.Plugs.RemoteIp, enabled: true