diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-11 22:34:48 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-11 22:34:48 +0300 |
| commit | 2498e569f12694439b6f99d0730f6fb36301c454 (patch) | |
| tree | 16ed4ac74e04dba66e696e3678d15a1e6fadbfaa /config/config.exs | |
| parent | 89c595b772eaaa8809f5339d708d7dc22e51b662 (diff) | |
| parent | bc3cf0fee0b93eb3cf8d2ba0f9a0dcc09b01331d (diff) | |
| download | pleroma-2498e569f12694439b6f99d0730f6fb36301c454.tar.gz pleroma-2498e569f12694439b6f99d0730f6fb36301c454.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 2e6b0796a..d53663d36 100644 --- a/config/config.exs +++ b/config/config.exs @@ -677,7 +677,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.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 |