projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests for Web/ActivityPub/Relay
[akkoma]
/
lib
/
pleroma
/
web
/
endpoint.ex
diff --git
a/lib/pleroma/web/endpoint.ex
b/lib/pleroma/web/endpoint.ex
index 8cd7a2270b87cc3ebfcc62d58eb4feb190d489ff..c123530dcf961c10a2dfd5179404c3a43c53613f 100644
(file)
--- a/
lib/pleroma/web/endpoint.ex
+++ b/
lib/pleroma/web/endpoint.ex
@@
-7,13
+7,9
@@
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)
@static_cache_control "public, no-cache"
plug(Pleroma.Plugs.UploadedMedia)
@static_cache_control "public, no-cache"
@@
-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: "/",
@@
-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,7
+91,7
@@
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