From: Mark Felder <feld@FreeBSd.org>
Date: Tue, 10 Apr 2018 14:17:23 +0000 (+0000)
Subject: Remove attempted caching of toots
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=fcb32345d7733d94314832043645c120603c2146;p=akkoma

Remove attempted caching of toots

This does not work as expected. We should not attempt to be clever here.
Varnish will do the right thing if we just teach Pleroma to set headers
properly for content we know can be cached.
---

diff --git a/installation/pleroma.vcl b/installation/pleroma.vcl
index e68938803..fe9bf056b 100644
--- a/installation/pleroma.vcl
+++ b/installation/pleroma.vcl
@@ -48,8 +48,6 @@ sub vcl_recv {
     # Strip headers that will affect caching from all other static content
     # This also permits caching of individual toots and AP Activities
     if ((req.url ~ "^/(media|notice|objects|static)/") ||
-    (req.url ~ "^/(activities/|api/v1/statuses/\d+$)") ||
-    (req.url ~ "^/(activities/|api/v1/statuses/\d+/card$)") ||
     (req.url ~ "(?i)\.(html|js|css|jpg|jpeg|png|gif|gz|tgz|bz2|tbz|mp3|ogg|svg|swf|ttf|pdf|woff|woff2)$"))
     {
       unset req.http.Cookie;
@@ -102,8 +100,6 @@ sub vcl_backend_response {
     # Strip cache-restricting headers from Pleroma on static content that we want to cache
     # Also enable streaming of cached content to clients (no waiting for Varnish to complete backend fetch)
     if ((bereq.url ~ "^/(notice|objects)/") ||
-    (bereq.url ~ "^/(activities/|api/v1/statuses/\d+$)") ||
-    (bereq.url ~ "^/(activities/|api/v1/statuses/\d+/card$)") ||
     (bereq.url ~ "(?i)\.(js|css|jpg|jpeg|png|gif|gz|tgz|bz2|tbz|mp3|ogg|svg|swf|ttf|pdf|woff|woff2)$"))
     {
       unset beresp.http.set-cookie;