diff options
| author | lain <lain@soykaf.club> | 2023-11-12 13:34:27 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2023-11-12 13:34:27 +0000 |
| commit | 5f19fbc5a99847e56235e128d36b49bbe76c454d (patch) | |
| tree | 816b81ea6b2e1a4b4a0cd237b354706754963dc2 /config/config.exs | |
| parent | e902c7168d40e10821e8060542f14168f78805a2 (diff) | |
| parent | ef6d3dddd411f47eeebb378a290f1f9b73a0b5a7 (diff) | |
| download | pleroma-5f19fbc5a99847e56235e128d36b49bbe76c454d.tar.gz pleroma-5f19fbc5a99847e56235e128d36b49bbe76c454d.zip | |
Merge branch 'phoenix1.7' into 'develop'
Update to Phoenix 1.7
See merge request pleroma/pleroma!3900
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/config/config.exs b/config/config.exs index ec7c5fe09..f2c137872 100644 --- a/config/config.exs +++ b/config/config.exs @@ -110,17 +110,6 @@ config :pleroma, :uri_schemes, "xmpp" ] -websocket_config = [ - path: "/websocket", - serializer: [ - {Phoenix.Socket.V1.JSONSerializer, "~> 1.0.0"}, - {Phoenix.Socket.V2.JSONSerializer, "~> 2.0.0"} - ], - timeout: 60_000, - transport_log: false, - compress: false -] - # Configures the endpoint config :pleroma, Pleroma.Web.Endpoint, url: [host: "localhost"], @@ -130,10 +119,7 @@ config :pleroma, Pleroma.Web.Endpoint, {:_, [ {"/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler, []}, - {"/websocket", Phoenix.Endpoint.CowboyWebSocket, - {Phoenix.Transports.WebSocket, - {Pleroma.Web.Endpoint, Pleroma.Web.UserSocket, websocket_config}}}, - {:_, Phoenix.Endpoint.Cowboy2Handler, {Pleroma.Web.Endpoint, []}} + {:_, Plug.Cowboy.Handler, {Pleroma.Web.Endpoint, []}} ]} ] ], |