Merge branch 'reverse_proxy_upstream_v4_fix' into 'develop'

explicitly set reverse proxy upstream to IPv4

Closes #930

See merge request pleroma/pleroma!1197

diff --git a/installation/caddyfile-pleroma.example b/installation/caddyfile-pleroma.example
index fcf76718e74ebd1f47f34e9461de26fc5c226779..7985d9c6746a6c2d2ef9bd682f184f013de11f93 100644 (file)
--- 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
index 2beb7c4cc5711e9101f3a430897fad48e09ea84a..b5640ac3dd81adca3a16faa231fa20ea525d6261 100644 (file)
--- 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
index cc75d78b2f8646c50be7b40ba538abb652886f09..7425da33f0d1879d7c3b84a5a5154050d0d5e0e8 100644 (file)
--- 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;
     }