Fix conflict

[akkoma] / installation / pleroma.nginx

diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index 6cf9f3fa0665d3fa4fd47d6d7410775cd32d51f0..25f6dadffc92059c72ff4ee9dee23ba27d497546 100644 (file)
--- 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;
@@ -5,7 +8,7 @@ server {
 }
 
 server {
-    listen 443;
+    listen 443 ssl http2;
     ssl on;
     ssl_session_timeout 5m;
 
@@ -18,12 +21,26 @@ server {
 
     server_name example.tld;
 
+    gzip_vary on;                                                                                                                         
+    gzip_proxied any;                                                                                                                     
+    gzip_comp_level 6;                                                                                                                    
+    gzip_buffers 16 8k;                                                                                                                   
+    gzip_http_version 1.1;                                                                                                                
+    gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript application/activity+json application/atom+xml;      
     location / {
+        add_header 'Access-Control-Allow-Origin' '*';
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
+        proxy_set_header Host $http_host;
+
+        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
+}