From: href <href@random.sh>
Date: Mon, 11 Dec 2017 01:45:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into media-proxy
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=9093b2cf4923274572729f46b688ab12f5a0bfdc;p=akkoma

Merge remote-tracking branch 'upstream/develop' into media-proxy
---

9093b2cf4923274572729f46b688ab12f5a0bfdc
diff --cc installation/pleroma.nginx
index d882908e4,6cf9f3fa0..4e88a426d
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@@ -22,15 -19,11 +22,18 @@@ server 
      server_name example.tld;
  
      location / {
+         proxy_http_version 1.1;
+         proxy_set_header Upgrade $http_upgrade;
+         proxy_set_header Connection "upgrade";
          proxy_pass http://localhost:4000;
      }
 +
 +    location /proxy {
 +        proxy_cache pleroma_media_cache;
 +        proxy_cache_lock on;
 +        proxy_pass http://localhost:4000;
 +    }
 +
      include snippets/well-known.conf;
  
 -}
 +}