aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-05-13 08:34:58 +0000
committerlambda <pleromagit@rogerbraun.net>2018-05-13 08:34:58 +0000
commit17bcff64456144f2f2560f01c7dfa9db44cd09c2 (patch)
tree5615a55a1378ec3c0303919a43b3a0994ce6a4b8
parent4ad5e7201260713d512782dfa5b707c4695b071a (diff)
parenta85d05167580035608909db241dd8f5756c351b9 (diff)
downloadpleroma-17bcff64456144f2f2560f01c7dfa9db44cd09c2.tar.gz
Merge branch 'feld-varnish' into 'develop'
More varnish fixes See merge request pleroma/pleroma!149
-rw-r--r--installation/pleroma.vcl5
1 files changed, 2 insertions, 3 deletions
diff --git a/installation/pleroma.vcl b/installation/pleroma.vcl
index f3faa9432..63c1cb74d 100644
--- a/installation/pleroma.vcl
+++ b/installation/pleroma.vcl
@@ -41,7 +41,7 @@ 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|static)/") ||
+ 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;
@@ -93,8 +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)/") ||
- (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;