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 /config/config.exs | |
| parent | 92d08d4113c4de09cd8d736ed1a0349745866eef (diff) | |
| parent | f9380289eb251c818e87e8f0ad0a41fc8bdd90aa (diff) | |
| download | pleroma-705ea1b975779180c15d7b32d22f7fb9a11b2ed9.tar.gz pleroma-705ea1b975779180c15d7b32d22f7fb9a11b2ed9.zip | |
Merge branch 'remote-ip' into 'develop'
Add `remote_ip` plug
See merge request pleroma/pleroma!1608
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 403ade60d..36bea19a0 100644 --- a/config/config.exs +++ b/config/config.exs @@ -591,6 +591,8 @@ config :pleroma, :rate_limit, nil config :pleroma, Pleroma.ActivityExpiration, enabled: true +config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false + config :pleroma, :web_cache_ttl, activity_pub: nil, activity_pub_question: 30_000 |