X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=config%2Fconfig.exs;h=dfd2fc434e47a4b7ff668dc6b9c0435de3663dcb;hb=6fd4163ab60be07b1a20ac8911e105ddca8e2095;hp=ef3baed9354042a0af90530b945c5514ee2e6423;hpb=f0ab60189e0749ca207b483b291c90f892dce6a3;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index ef3baed93..dfd2fc434 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -79,7 +79,7 @@ config :ex_aws, :s3,
   # host: "s3.wasabisys.com", # required if not Amazon AWS
   access_key_id: nil,
   secret_access_key: nil,
-  # region: nil, # example: "us-east-1"
+  # region: "us-east-1", # may be required for Amazon AWS
   scheme: "https://"
 
 config :pleroma, :emoji,
@@ -551,12 +551,14 @@ config :pleroma, Oban,
     scheduled_activities: 10,
     background: 5,
     remote_fetcher: 2,
-    attachments_cleanup: 5,
+    attachments_cleanup: 1,
     new_users_digest: 1,
+    hashtags_cleanup: 1,
     mute_expire: 5
   ],
   plugins: [Oban.Plugins.Pruner],
   crontab: [
+    {"0 1 * * *", Pleroma.Workers.Cron.HashtagsCleanupWorker},
     {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker},
     {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker}
   ]
@@ -832,6 +834,11 @@ config :pleroma, Pleroma.User.Backup,
   limit_days: 7,
   dir: nil
 
+config :pleroma, ConcurrentLimiter, [
+  {Pleroma.Web.RichMedia.Helpers, [max_running: 5, max_waiting: 5]},
+  {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]}
+]
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"