aboutsummaryrefslogtreecommitdiff
path: root/installation
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-04-10 14:45:46 +0000
committerlambda <pleromagit@rogerbraun.net>2018-04-10 14:45:46 +0000
commit6ff583e5e10e59fe76cb51ce3d04587307af9eae (patch)
tree3b4f530b8da926ecac8e454039086361c3372575 /installation
parentfcc941adfd6741fd645ca3d232e24f1c68c3d65d (diff)
parentfcb32345d7733d94314832043645c120603c2146 (diff)
downloadpleroma-6ff583e5e10e59fe76cb51ce3d04587307af9eae.tar.gz
Merge branch 'feld-varnish' into 'develop'
Remove attempted caching of toots See merge request pleroma/pleroma!106
Diffstat (limited to 'installation')
-rw-r--r--installation/pleroma.vcl4
1 files changed, 0 insertions, 4 deletions
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;