commit: a9baf955fa47b58ec9ae1f90da14abc10379dcde
parent: 6c2903d9a175cfbf3785d5c1a43e6fcac6b0e9f5
Author: lambda <pleromagit@rogerbraun.net>
Date: Sun, 6 May 2018 18:43:57 +0000
Merge branch 'feld-varnish' into 'develop'
Caching /objects/ URLs breaks them in Mastoweb as they don't redirect to the /notice/
See merge request pleroma/pleroma!110
Diffstat:
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/installation/pleroma.vcl b/installation/pleroma.vcl
@@ -39,15 +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)/") ||
+ if ((req.url ~ "^/(media|notice|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;
@@ -99,7 +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)/") ||
+ 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)$"))
{
unset beresp.http.set-cookie;