projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat...
[akkoma]
/
lib
/
pleroma
/
web
/
endpoint.ex
diff --git
a/lib/pleroma/web/endpoint.ex
b/lib/pleroma/web/endpoint.ex
index 8cd7a2270b87cc3ebfcc62d58eb4feb190d489ff..49735b5c2f858fd38e0cb8aa13baa2b7a7e9de1e 100644
(file)
--- a/
lib/pleroma/web/endpoint.ex
+++ b/
lib/pleroma/web/endpoint.ex
@@
-7,16
+7,12
@@
defmodule Pleroma.Web.Endpoint do
socket("/socket", Pleroma.Web.UserSocket)
socket("/socket", Pleroma.Web.UserSocket)
- # 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(Pleroma.Plugs.SetLocalePlug)
plug(CORSPlug)
plug(Pleroma.Plugs.HTTPSecurityPlug)
plug(CORSPlug)
plug(Pleroma.Plugs.HTTPSecurityPlug)
-
plug(Pleroma.Plugs.UploadedMedia)
plug(Pleroma.Plugs.UploadedMedia)
- @static_cache_control "public
, no-cach
e"
+ @static_cache_control "public
max-age=86400 must-revalidat
e"
# 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
# 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
@@
-30,6
+26,10
@@
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: "/",
plug(
Plug.Static,
at: "/",
@@
-57,7
+57,7
@@
defmodule Pleroma.Web.Endpoint do
plug(Phoenix.CodeReloader)
end
plug(Phoenix.CodeReloader)
end
- plug(TrailingFormatPlug)
+ plug(
Pleroma.Plugs.
TrailingFormatPlug)
plug(Plug.RequestId)
plug(Plug.Logger)
plug(Plug.RequestId)
plug(Plug.Logger)
@@
-66,7
+66,7
@@
defmodule Pleroma.Web.Endpoint do
parsers: [:urlencoded, :multipart, :json],
pass: ["*/*"],
json_decoder: Jason,
parsers: [:urlencoded, :multipart, :json],
pass: ["*/*"],
json_decoder: Jason,
- length:
Application.get_env(:pleroma, :instance) |> Keyword.get(:upload_limit
),
+ length:
Pleroma.Config.get([:instance, :upload_limit]
),
body_reader: {Pleroma.Web.Plugs.DigestPlug, :read_body, []}
)
body_reader: {Pleroma.Web.Plugs.DigestPlug, :read_body, []}
)
@@
-91,16
+91,13
@@
defmodule Pleroma.Web.Endpoint do
Plug.Session,
store: :cookie,
key: cookie_name,
Plug.Session,
store: :cookie,
key: cookie_name,
- signing_salt:
{Pleroma.Config, :get, [[__MODULE__, :signing_salt], "CqaoopA2"]}
,
+ signing_salt:
Pleroma.Config.get([__MODULE__, :signing_salt], "CqaoopA2")
,
http_only: true,
secure: secure_cookies,
extra: extra
)
http_only: true,
secure: secure_cookies,
extra: extra
)
- # Note: the plug and its configuration is compile-time this can't be upstreamed yet
- if proxies = Pleroma.Config.get([__MODULE__, :reverse_proxies]) do
- plug(RemoteIp, proxies: proxies)
- end
+ plug(Pleroma.Plugs.RemoteIp)
defmodule Instrumenter do
use Prometheus.PhoenixInstrumenter
defmodule Instrumenter do
use Prometheus.PhoenixInstrumenter