diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-09-13 12:24:57 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-09-13 12:24:57 +0300 |
| commit | c5830ac037c0c344bd22b674c41f4dc244a088aa (patch) | |
| tree | d5a02f43337536d05b934bee3012dab319ccc127 /config/config.exs | |
| parent | 527afb813af6c64337d02ddf1a2f159fe557acbc (diff) | |
| parent | 88fe0a262e21ba1284e72eddb1d41363dc029aa7 (diff) | |
| download | pleroma-c5830ac037c0c344bd22b674c41f4dc244a088aa.tar.gz pleroma-c5830ac037c0c344bd22b674c41f4dc244a088aa.zip | |
Merge develop
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/config/config.exs b/config/config.exs index 84a02bc2e..c975da739 100644 --- a/config/config.exs +++ b/config/config.exs @@ -454,9 +454,7 @@ config :pleroma, :gopher, config :pleroma, Pleroma.Web.Metadata, providers: [ Pleroma.Web.Metadata.Providers.OpenGraph, - Pleroma.Web.Metadata.Providers.TwitterCard, - Pleroma.Web.Metadata.Providers.RelMe, - Pleroma.Web.Metadata.Providers.Feed + Pleroma.Web.Metadata.Providers.TwitterCard ], unfurl_nsfw: false @@ -532,6 +530,7 @@ config :pleroma, Oban, log: false, queues: [ activity_expiration: 10, + token_expiration: 5, federator_incoming: 50, federator_outgoing: 50, web_push: 50, @@ -546,8 +545,6 @@ config :pleroma, Oban, ], plugins: [Oban.Plugins.Pruner], crontab: [ - {"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker}, - {"* * * * *", Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker}, {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker}, {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker} ] @@ -658,7 +655,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 |