X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=installation%2Fpleroma.nginx;h=de380a6ca5efa449f129186d8b872f2afa467e0a;hb=9d487ba57949a4102aa2eb67b26842f1c0ef418c;hp=8709f2cb774d44e5831409bf57927b8ee94a549f;hpb=2f008144756399f21582cfe907e870802ff81d04;p=akkoma

diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index 8709f2cb7..de380a6ca 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -14,7 +14,6 @@ server {
 
     listen         80;
     listen         [::]:80;
-    return         301 https://$server_name$request_uri;
 
     # Uncomment this if you need to use the 'webroot' method with certbot. Make sure
     # that the directory exists and that it is accessible by the webserver. If you followed
@@ -23,8 +22,11 @@ server {
     # to get the certificate, and then uncomment it.
     #
     # location ~ /\.well-known/acme-challenge {
-    #     root /var/lib/letsencrypt/.well-known/acme-challenge;
+    #     root /var/lib/letsencrypt/;
     # }
+    location / {
+      return         301 https://$server_name$request_uri;
+    }
 }
 
 # Enable SSL session caching for improved performance
@@ -37,7 +39,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 +71,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;
     }