diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-03-01 09:42:34 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-03-01 09:42:34 +0000 |
| commit | b37b26ab87a60d6fb5c9c208a13ed7521aba3fbd (patch) | |
| tree | e5d52e60f8968ed8ece5029459c7d73036e026fd /config | |
| parent | a47cc5a2cf808b6a06d4d17f195b6a98458ad89d (diff) | |
| parent | 6b2a1ad1c84b7ef350b0d0be76d6b2e03c633260 (diff) | |
| download | pleroma-b37b26ab87a60d6fb5c9c208a13ed7521aba3fbd.tar.gz pleroma-b37b26ab87a60d6fb5c9c208a13ed7521aba3fbd.zip | |
Merge branch 'feature/cowboy2' into 'develop'
upgrade to cowboy 2.6
See merge request pleroma/pleroma!876
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs index 7e4ac1100..a620e7451 100644 --- a/config/config.exs +++ b/config/config.exs @@ -93,10 +93,11 @@ config :pleroma, Pleroma.Web.Endpoint, dispatch: [ {:_, [ - {"/api/v1/streaming", Elixir.Pleroma.Web.MastodonAPI.WebsocketHandler, []}, - {"/socket/websocket", Phoenix.Endpoint.CowboyWebSocket, - {nil, {Pleroma.Web.Endpoint, Pleroma.Web.UserSocket, websocket_config}}}, - {:_, Plug.Adapters.Cowboy.Handler, {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, []}} ]} ] ], |