summaryrefslogtreecommitdiff
path: root/installation/pleroma.nginx
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-09-28 10:32:03 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-09-28 10:36:04 +0300
commit1053319cd64a0eab40fab6dc9ce3a1b78711069b (patch)
tree3d613f7c6129f667ea16aedfe46259d9ca6bde29 /installation/pleroma.nginx
parent73ae38ca04df02656bfb239ceba4ffe64879e927 (diff)
parent50ab06435353144582f6afbf37402aef13c2b3f1 (diff)
downloadpleroma-1053319cd64a0eab40fab6dc9ce3a1b78711069b.tar.gz
pleroma-1053319cd64a0eab40fab6dc9ce3a1b78711069b.zip
Merge branch 'develop' into tests/mastodon_api_controller.ex
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