Merge branch 'develop' into chore/elixir-1.11

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 47fc7957b5c28e58d1e70561073b8f89e1dfaf50..3d1f4d4ba10dc59c3e36559951c292653674f0d6 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -676,7 +676,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