X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=63e386250022cb901e48e6f62c5635814f992e8d;hb=1fb9452131721456adf2c19c513e6343f64825a7;hp=0e12d6e15f58f2bf4e13a7a2bc0dab43664c3529;hpb=bc3db724030707e9903d161a70b10fe217a83212;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index 0e12d6e15..63e386250 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -678,7 +678,18 @@ config :pleroma, :rate_limit,
 
 config :pleroma, Pleroma.Workers.PurgeExpiredActivity, enabled: true, min_lifetime: 600
 
-config :pleroma, Pleroma.Plugs.RemoteIp, enabled: true
+config :pleroma, Pleroma.Web.Plugs.RemoteIp,
+  enabled: true,
+  headers: ["x-forwarded-for"],
+  proxies: [],
+  reserved: [
+    "127.0.0.0/8",
+    "::1/128",
+    "fc00::/7",
+    "10.0.0.0/8",
+    "172.16.0.0/12",
+    "192.168.0.0/16"
+  ]
 
 config :pleroma, :static_fe, enabled: false
 
@@ -792,6 +803,8 @@ config :pleroma, :hackney_pools,
     timeout: 300_000
   ]
 
+config :pleroma, :majic_pool, size: 2
+
 private_instance? = :if_instance_is_private
 
 config :pleroma, :restrict_unauthenticated,