summaryrefslogtreecommitdiff
path: root/installation/pleroma.nginx
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2019-09-30 17:41:20 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2019-09-30 17:41:20 +0300
commit6ffa2b5f661c2db424334c6fb5de6f4d1bfeb745 (patch)
treedd1b2129f3eb7df7b0141cc65ba6c492a36863d0 /installation/pleroma.nginx
parentc98e761d28812818971d327800f1fc4c2baa2dbc (diff)
parenta22a7437d84065192601f73da73d2c27111c9b15 (diff)
downloadpleroma-6ffa2b5f661c2db424334c6fb5de6f4d1bfeb745.tar.gz
pleroma-6ffa2b5f661c2db424334c6fb5de6f4d1bfeb745.zip
[#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts: # CHANGELOG.md
Diffstat (limited to 'installation/pleroma.nginx')
-rw-r--r--installation/pleroma.nginx1
1 files changed, 1 insertions, 0 deletions
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index 4da9918ca..7f48b614b 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -70,6 +70,7 @@ server {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header Host $http_host;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# this is explicitly IPv4 since Pleroma.Web.Endpoint binds on IPv4 only
# and `localhost.` resolves to [::0] on some systems: see issue #930