summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2024-02-15 14:36:54 +0000
committerfeld <feld@feld.me>2024-02-15 14:36:54 +0000
commit4dd8a1a1ca08966a0729253ee070295f664f0e1f (patch)
tree9262d7ac1bee36bbec3c827a645955da7a4f3807 /config
parentd3208d225048c1a55b44d7d8ce324a6fef8ac14d (diff)
parent6be129ead2ff5d6a19edf7230d102aa51a731b03 (diff)
downloadpleroma-4dd8a1a1ca08966a0729253ee070295f664f0e1f.tar.gz
pleroma-4dd8a1a1ca08966a0729253ee070295f664f0e1f.zip
Merge branch 'websocket-refactor' into 'develop'
Websocket refactor to use Phoenix.Socket.Transport See merge request pleroma/pleroma!4064
Diffstat (limited to 'config')
-rw-r--r--config/config.exs9
1 files changed, 1 insertions, 8 deletions
diff --git a/config/config.exs b/config/config.exs
index bb17ab145..435387a64 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -114,14 +114,7 @@ config :pleroma, :uri_schemes,
config :pleroma, Pleroma.Web.Endpoint,
url: [host: "localhost"],
http: [
- ip: {127, 0, 0, 1},
- dispatch: [
- {:_,
- [
- {"/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler, []},
- {:_, Plug.Cowboy.Handler, {Pleroma.Web.Endpoint, []}}
- ]}
- ]
+ ip: {127, 0, 0, 1}
],
protocol: "https",
secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",