projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/develop' into develop
[akkoma]
/
lib
/
pleroma
/
web
/
endpoint.ex
diff --git
a/lib/pleroma/web/endpoint.ex
b/lib/pleroma/web/endpoint.ex
index 7e197ebc5d0f6a8674681b9e5946c74e51b4fc8c..0cb6aff160afd0620976fd4278b52db5d3fd2593 100644
(file)
--- a/
lib/pleroma/web/endpoint.ex
+++ b/
lib/pleroma/web/endpoint.ex
@@
-23,6
+23,18
@@
defmodule Pleroma.Web.Endpoint do
# 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
# Cache-control headers are duplicated in case we turn off etags in the future
# 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
# Cache-control headers are duplicated in case we turn off etags in the future
+ plug(
+ Pleroma.Web.Plugs.InstanceStatic,
+ at: "/",
+ from: :pleroma,
+ only: ["emoji", "images"],
+ gzip: true,
+ cache_control_for_etags: "public, max-age=1209600",
+ headers: %{
+ "cache-control" => "public, max-age=1209600"
+ }
+ )
+
plug(Pleroma.Web.Plugs.InstanceStatic,
at: "/",
gzip: true,
plug(Pleroma.Web.Plugs.InstanceStatic,
at: "/",
gzip: true,
@@
-55,22
+67,22
@@
defmodule Pleroma.Web.Endpoint do
}
)
}
)
- # Serve at "/" the static files from "priv/static" directory.
- #
- # You should set gzip to true if you are running phoenix.digest
- # when deploying your static files in production.
- plug(
- Plug.Static,
- at: "/",
- from: :pleroma,
- only: ["emoji", "images"],
+ plug(Plug.Static.IndexHtml, at: "/pleroma/fedife/")
+
+ plug(Pleroma.Web.Plugs.FrontendStatic,
+ at: "/pleroma/fedife",
+ frontend_type: :fedife,
gzip: true,
gzip: true,
- cache_control_for_etags:
"public, max-age=1209600"
,
+ cache_control_for_etags:
@static_cache_control
,
headers: %{
headers: %{
- "cache-control" =>
"public, max-age=1209600"
+ "cache-control" =>
@static_cache_control
}
)
}
)
+ # Serve at "/" the static files from "priv/static" directory.
+ #
+ # You should set gzip to true if you are running phoenix.digest
+ # when deploying your static files in production.
plug(
Plug.Static,
at: "/",
plug(
Plug.Static,
at: "/",