Merge branch 'media-proxy' into 'develop'

Media proxy

See merge request pleroma/pleroma!34

1 files changed, 11 insertions, 1 deletions

diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index 6cf9f3fa0..4e88a426d 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -1,3 +1,6 @@
+proxy_cache_path /tmp/pleroma-media-cache levels=1:2 keys_zone=pleroma_media_cache:10m max_size=10g
+                 inactive=720m use_temp_path=off;
+
 server {
        listen         80;
        server_name    example.tld;
@@ -24,6 +27,13 @@ server {
         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;
 
-}
\ No newline at end of file
+}