Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 2a0c6302cb5ca0a866e82ab2d31e227043eddddd..635dd4ae25ba3917ad8688812ee41c5bdf1517f7 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -72,14 +72,14 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
 config :pleroma, Pleroma.Uploaders.S3,
   bucket: nil,
   bucket_namespace: nil,
-  truncated_namespace: false,
+  truncated_namespace: nil,
   streaming_enabled: true
 
 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,
@@ -222,6 +222,9 @@ config :pleroma, :instance,
     "text/markdown",
     "text/bbcode"
   ],
+  mrf_transparency: true,
+  mrf_transparency_exclusions: [],
+  staff_transparency: [],
   autofollowed_nicknames: [],
   autofollowing_nicknames: [],
   max_pinned_statuses: 1,
@@ -551,7 +554,7 @@ config :pleroma, Oban,
     scheduled_activities: 10,
     background: 5,
     remote_fetcher: 2,
-    attachments_cleanup: 5,
+    attachments_cleanup: 1,
     new_users_digest: 1,
     mute_expire: 5
   ],
@@ -832,6 +835,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"