summaryrefslogtreecommitdiff
path: root/installation/pleroma.nginx
diff options
context:
space:
mode:
authorSachin Joshi <satchin.joshi@gmail.com>2019-06-01 11:42:37 +0545
committerSachin Joshi <satchin.joshi@gmail.com>2019-06-01 11:42:37 +0545
commitad5263c647aea65dbeb4c329825671895e0a8863 (patch)
tree6217011a3fd2ea943498ce296de07cefe1206b87 /installation/pleroma.nginx
parent5534d4c67675901ab272ee47355ad43dfae99033 (diff)
parentf1890d2cacfa09dd22b06a8d041c04dbeba9e138 (diff)
downloadpleroma-ad5263c647aea65dbeb4c329825671895e0a8863.tar.gz
pleroma-ad5263c647aea65dbeb4c329825671895e0a8863.zip
Merge remote-tracking branch 'upstream/develop' into admin-create-users
Diffstat (limited to 'installation/pleroma.nginx')
-rw-r--r--installation/pleroma.nginx4
1 files changed, 3 insertions, 1 deletions
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index cc75d78b2..7425da33f 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -69,7 +69,9 @@ server {
proxy_set_header Connection "upgrade";
proxy_set_header Host $http_host;
- proxy_pass http://localhost:4000;
+ # this is explicitly IPv4 since Pleroma.Web.Endpoint binds on IPv4 only
+ # and `localhost.` resolves to [::0] on some systems: see issue #930
+ proxy_pass http://127.0.0.1:4000;
client_max_body_size 16m;
}