Merge branch 'preload-data' into 'develop'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index bd559c835578ff9f77d9c765824f88247cebb4f2..5b1c576e7a5edcf7aba348817ee7f6d38502beb4 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -434,6 +434,14 @@ config :pleroma, Pleroma.Web.Metadata,
   ],
   unfurl_nsfw: false
 
+config :pleroma, Pleroma.Web.Preload,
+  providers: [
+    Pleroma.Web.Preload.Providers.Instance,
+    Pleroma.Web.Preload.Providers.User,
+    Pleroma.Web.Preload.Providers.Timelines,
+    Pleroma.Web.Preload.Providers.StatusNet
+  ]
+
 config :pleroma, :http_security,
   enabled: true,
   sts: false,
@@ -697,6 +705,8 @@ config :pleroma, :mrf,
 
 config :tzdata, :http_client, Pleroma.HTTP.Tzdata
 
+config :ex_aws, http_client: Pleroma.HTTP.ExAws
+
 # 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"