diff options
| author | kaniini <nenolod@gmail.com> | 2019-05-24 20:33:55 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-05-24 20:33:55 +0000 |
| commit | 8a0ee011ac7b679876eb7d81547dde416c208af1 (patch) | |
| tree | 4fbfb1e1b349f927b06f0a1669ff39d661650e56 /lib | |
| parent | 6499adc6a83b4064f7283de3c729053e62ade7b2 (diff) | |
| parent | f916e4cdd9a502b83c615146c598be135f47e57a (diff) | |
| download | pleroma-8a0ee011ac7b679876eb7d81547dde416c208af1.tar.gz | |
Merge branch 'feature/static-headers' into 'develop'
Improve serving of static assets
See merge request pleroma/pleroma!1200
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/endpoint.ex | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex index 9ef30e885..8cd7a2270 100644 --- a/lib/pleroma/web/endpoint.ex +++ b/lib/pleroma/web/endpoint.ex @@ -16,17 +16,32 @@ defmodule Pleroma.Web.Endpoint do plug(Pleroma.Plugs.UploadedMedia) + @static_cache_control "public, no-cache" + # InstanceStatic needs to be before Plug.Static to be able to override shipped-static files # If you're adding new paths to `only:` you'll need to configure them in InstanceStatic as well - plug(Pleroma.Plugs.InstanceStatic, at: "/") + # Cache-control headers are duplicated in case we turn off etags in the future + plug(Pleroma.Plugs.InstanceStatic, + at: "/", + gzip: true, + cache_control_for_etags: @static_cache_control, + headers: %{ + "cache-control" => @static_cache_control + } + ) plug( Plug.Static, at: "/", from: :pleroma, only: - ~w(index.html robots.txt static finmoji emoji packs sounds images instance sw.js sw-pleroma.js favicon.png schemas doc) + ~w(index.html robots.txt static finmoji emoji packs sounds images instance sw.js sw-pleroma.js favicon.png schemas doc), # credo:disable-for-previous-line Credo.Check.Readability.MaxLineLength + gzip: true, + cache_control_for_etags: @static_cache_control, + headers: %{ + "cache-control" => @static_cache_control + } ) plug(Plug.Static.IndexHtml, at: "/pleroma/admin/") |