X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=config%2Fconfig.exs;h=4dc7a62d72824b84fb813c46b73295d1274a73fc;hb=bd5086731ead7399924986392e03d1974986403a;hp=7f63a0a3966770971ed02e5b49e142b82755848f;hpb=e221c681dcd387aa445c35957a32fdc0189a0955;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index 7f63a0a39..4dc7a62d7 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -15,6 +15,20 @@ config :pleroma, Pleroma.Captcha,
   seconds_valid: 60,
   method: Pleroma.Captcha.Kocaptcha
 
+config :pleroma, :hackney_pools,
+  federation: [
+    max_connections: 50,
+    timeout: 150_000
+  ],
+  media: [
+    max_connections: 50,
+    timeout: 150_000
+  ],
+  upload: [
+    max_connections: 25,
+    timeout: 300_000
+  ]
+
 config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
 
 # Upload configuration
@@ -22,7 +36,14 @@ config :pleroma, Pleroma.Upload,
   uploader: Pleroma.Uploaders.Local,
   filters: [],
   proxy_remote: false,
-  proxy_opts: []
+  proxy_opts: [
+    redirect_on_failure: false,
+    max_body_length: 25 * 1_048_576,
+    http: [
+      follow_redirect: true,
+      pool: :upload
+    ]
+  ]
 
 config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
 
@@ -177,7 +198,7 @@ config :pleroma, :frontend_configurations,
   pleroma_fe: %{
     theme: "pleroma-dark",
     logo: "/static/logo.png",
-    background: "/static/aurora_borealis.jpg",
+    background: "/images/city.jpg",
     redirectRootNoLogin: "/main/all",
     redirectRootLogin: "/main/friends",
     showInstanceSpecificPanel: true,
@@ -214,7 +235,16 @@ config :pleroma, :mrf_simple,
   reject: [],
   accept: []
 
-config :pleroma, :media_proxy, enabled: false
+config :pleroma, :media_proxy,
+  enabled: false,
+  proxy_opts: [
+    redirect_on_failure: false,
+    max_body_length: 25 * 1_048_576,
+    http: [
+      follow_redirect: true,
+      pool: :media
+    ]
+  ]
 
 config :pleroma, :chat, enabled: true
 
@@ -227,6 +257,8 @@ config :pleroma, :gopher,
   ip: {0, 0, 0, 0},
   port: 9999
 
+config :pleroma, Pleroma.Web.Metadata, providers: [], unfurl_nsfw: false
+
 config :pleroma, :suggestions,
   enabled: false,
   third_party_engine: