sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove attempted caching of toots

Browse Source 
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.
This commit is contained in:
Mark Felder 2018-04-10 14:17:23 +00:00
parent c8c0519f52
commit fcb32345d7
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
installation/pleroma.vcl
View File

@ -48,8 +48,6 @@ sub vcl_recv {
# Strip headers that will affect caching from all other static content # Strip headers that will affect caching from all other static content
# This also permits caching of individual toots and AP Activities # This also permits caching of individual toots and AP Activities
if ((req.url ~ "^/(media|notice|objects|static)/") || 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)$")) (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; 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 # 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) # Also enable streaming of cached content to clients (no waiting for Varnish to complete backend fetch)
if ((bereq.url ~ "^/(notice|objects)/") || 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)$")) (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.set-cookie;