From 5256c712dc9750523fe2b72fe845e1b2c950e86c Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Fri, 13 Apr 2018 13:40:24 +0000 Subject: [PATCH 1/2] Caching /objects/ URLs breaks them in Mastoweb as they don't redirect to the /notice/ Not sure why it matters if you cache it or not. What's different about this JSON blob? Perhaps it's a header that needs to be set for the redirect to happen? --- installation/pleroma.vcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/installation/pleroma.vcl b/installation/pleroma.vcl index fe9bf056b..466fc8eb1 100644 --- a/installation/pleroma.vcl +++ b/installation/pleroma.vcl @@ -47,7 +47,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|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 +99,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; From 8dbb4c6c50a5308f4f41c59b562ed8f344648d0e Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Thu, 19 Apr 2018 18:58:13 +0000 Subject: [PATCH 2/2] Remove hack for /about/more as we are doing this in Pleroma now --- installation/pleroma.vcl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/installation/pleroma.vcl b/installation/pleroma.vcl index 466fc8eb1..f3faa9432 100644 --- a/installation/pleroma.vcl +++ b/installation/pleroma.vcl @@ -39,12 +39,6 @@ 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|static)/") ||