Merge branch 'develop' into feature/activitypub

2 files changed, 16 insertions, 2 deletions

diff --git a/installation/Caddyfile b/installation/Caddyfile
new file mode 100644
index 000000000..08d5e6169
--- /dev/null
+++ b/installation/Caddyfile
@@ -0,0 +1,5 @@
+instance.example.com  {  # Your instance's domain
+  proxy / localhost:4000 {
+    websocket
+  }
+}
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index 6cf9f3fa0..f714792da 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;
@@ -19,11 +22,17 @@ server {
     server_name example.tld;
 
     location / {
+        add_header 'Access-Control-Allow-Origin' '*';
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
         proxy_pass http://localhost:4000;
     }
-    include snippets/well-known.conf;
 
-}
\ No newline at end of file
+    location /proxy {
+        proxy_cache pleroma_media_cache;
+        proxy_cache_lock on;
+        proxy_pass http://localhost:4000;
+    }
+
+}