diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-09-27 21:59:23 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-09-27 21:59:23 +0000 |
| commit | 705ea1b975779180c15d7b32d22f7fb9a11b2ed9 (patch) | |
| tree | 5bb67874c8b34ad13f25055938826475f38e2301 /lib/pleroma/web | |
| parent | 92d08d4113c4de09cd8d736ed1a0349745866eef (diff) | |
| parent | f9380289eb251c818e87e8f0ad0a41fc8bdd90aa (diff) | |
| download | pleroma-705ea1b975779180c15d7b32d22f7fb9a11b2ed9.tar.gz | |
Merge branch 'remote-ip' into 'develop'
Add `remote_ip` plug
See merge request pleroma/pleroma!1608
Diffstat (limited to 'lib/pleroma/web')
| -rw-r--r-- | lib/pleroma/web/endpoint.ex | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex index eb805e853..2212e93f4 100644 --- a/lib/pleroma/web/endpoint.ex +++ b/lib/pleroma/web/endpoint.ex @@ -97,10 +97,7 @@ defmodule Pleroma.Web.Endpoint do extra: extra ) - # Note: the plug and its configuration is compile-time this can't be upstreamed yet - if proxies = Pleroma.Config.get([__MODULE__, :reverse_proxies]) do - plug(RemoteIp, proxies: proxies) - end + plug(Pleroma.Plugs.RemoteIp) defmodule Instrumenter do use Prometheus.PhoenixInstrumenter |