logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 6499adc6a83b4064f7283de3c729053e62ade7b2
parent: 75e78d4e239a5c999306e92b181b0e29c52dc9db
Author: lambda <lain@soykaf.club>
Date:   Fri, 24 May 2019 09:54:45 +0000

Merge branch 'reverse_proxy_upstream_v4_fix' into 'develop'

explicitly set reverse proxy upstream to IPv4

Closes #930

See merge request pleroma/pleroma!1197

Diffstat:

Minstallation/caddyfile-pleroma.example4+++-
Minstallation/pleroma-apache.conf6++++--
Minstallation/pleroma.nginx4+++-
3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/installation/caddyfile-pleroma.example b/installation/caddyfile-pleroma.example @@ -10,7 +10,9 @@ example.tld { gzip - proxy / 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 / 127.0.0.1:4000 { websocket transparent } diff --git a/installation/pleroma-apache.conf b/installation/pleroma-apache.conf @@ -58,8 +58,10 @@ CustomLog ${APACHE_LOG_DIR}/access.log combined RewriteRule /(.*) ws://localhost:4000/$1 [P,L] ProxyRequests off - ProxyPass / http://localhost:4000/ - ProxyPassReverse / 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 + ProxyPass / http://127.0.0.1:4000/ + ProxyPassReverse / http://127.0.0.1:4000/ RequestHeader set Host ${servername} ProxyPreserveHost On diff --git 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; }