X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=installation%2Fpleroma.vcl;h=63c1cb74dbf01f5b7a72285d83f35306c997b96f;hb=49cf5f9ce04e79da5d6ceb16f4043eeaade9b211;hp=869d9fe66aa48db77e241320d4f60d70aa1b2a4e;hpb=bdc522da1b9d6cf5d057a1de51babe49e943fadb;p=akkoma

diff --git a/installation/pleroma.vcl b/installation/pleroma.vcl
index 869d9fe66..63c1cb74d 100644
--- a/installation/pleroma.vcl
+++ b/installation/pleroma.vcl
@@ -39,17 +39,9 @@ sub vcl_recv {
         return (hash);
     }
 
-    # Hack to enable a Terms of Service page missing from Pleroma
-    if (req.url ~ "^/about/more$") {
-        set req.http.x-redir = "https://" + req.http.host + "/static/terms-of-service.html";
-        return (synth(750, ""));
-    }
-
     # 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$)") ||
+    if ((req.url ~ "^/(media|static)/") ||
     (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;
@@ -101,10 +93,7 @@ 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)$"))
+    if (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;
       unset beresp.http.Cache-Control;
@@ -114,7 +103,7 @@ sub vcl_backend_response {
     }
 }
 
-# The synthetic response for the HTTP to HTTPS upgrade
+# The synthetic response for 301 redirects
 sub vcl_synth {
     if (resp.status == 750) {
       set resp.status = 301;