projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix case when tags is invalid
[akkoma]
/
lib
/
pleroma
/
web
/
endpoint.ex
diff --git
a/lib/pleroma/web/endpoint.ex
b/lib/pleroma/web/endpoint.ex
index 85bb4ff5f45a3a7a1d38b70c7eb730cebb68430e..c5f9d51d92d77cc9675d384b842810c98d838a19 100644
(file)
--- a/
lib/pleroma/web/endpoint.ex
+++ b/
lib/pleroma/web/endpoint.ex
@@
-1,9
+1,7
@@
defmodule Pleroma.Web.Endpoint do
use Phoenix.Endpoint, otp_app: :pleroma
defmodule Pleroma.Web.Endpoint do
use Phoenix.Endpoint, otp_app: :pleroma
- if Application.get_env(:pleroma, :chat) |> Keyword.get(:enabled) do
- socket("/socket", Pleroma.Web.UserSocket)
- end
+ socket("/socket", Pleroma.Web.UserSocket)
socket("/api/v1", Pleroma.Web.MastodonAPI.MastodonSocket)
socket("/api/v1", Pleroma.Web.MastodonAPI.MastodonSocket)
@@
-14,7
+12,7
@@
defmodule Pleroma.Web.Endpoint do
plug(CORSPlug)
plug(Pleroma.Plugs.HTTPSecurityPlug)
plug(CORSPlug)
plug(Pleroma.Plugs.HTTPSecurityPlug)
- plug(Pl
ug.Static, at: "/media", from: Pleroma.Uploaders.Local.upload_path(), gzip: false
)
+ plug(Pl
eroma.Plugs.UploadedMedia
)
plug(
Plug.Static,
plug(
Plug.Static,
@@
-58,7
+56,7
@@
defmodule Pleroma.Web.Endpoint do
Plug.Session,
store: :cookie,
key: cookie_name,
Plug.Session,
store: :cookie,
key: cookie_name,
- signing_salt:
"CqaoopA2"
,
+ signing_salt:
{Pleroma.Config, :get, [[__MODULE__, :signing_salt], "CqaoopA2"]}
,
http_only: true,
secure:
Application.get_env(:pleroma, Pleroma.Web.Endpoint) |> Keyword.get(:secure_cookie_flag),
http_only: true,
secure:
Application.get_env(:pleroma, Pleroma.Web.Endpoint) |> Keyword.get(:secure_cookie_flag),