Merge remote-tracking branch 'upstream/develop' into admin-create-users

[akkoma] / installation / pleroma.nginx

diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index 8709f2cb774d44e5831409bf57927b8ee94a549f..7425da33f0d1879d7c3b84a5a5154050d0d5e0e8 100644 (file)
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -37,7 +37,7 @@ server {
     listen [::]:443 ssl http2;
     ssl_session_timeout 5m;
 
-    ssl_trusted_certificate   /etc/letsencrypt/live/example.tld/fullchain.pem;
+    ssl_trusted_certificate   /etc/letsencrypt/live/example.tld/chain.pem;
     ssl_certificate           /etc/letsencrypt/live/example.tld/fullchain.pem;
     ssl_certificate_key       /etc/letsencrypt/live/example.tld/privkey.pem;
 
@@ -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;
     }