diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-10-21 21:13:49 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-10-21 21:14:58 +0300 |
| commit | fb0e3403632ed10ba7d226d998618e0a894d2538 (patch) | |
| tree | 0e818541570d71bc63676b7b7f7d2454af48ed8a /config | |
| parent | 274c8e6fabeb65813f76766ccaa22227168c726e (diff) | |
| download | pleroma-fb0e3403632ed10ba7d226d998618e0a894d2538.tar.gz | |
Rip out fedsockets from the release branch
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 | ||||
| -rw-r--r-- | config/description.exs | 13 |
2 files changed, 3 insertions, 14 deletions
diff --git a/config/config.exs b/config/config.exs index 2c6142360..148e9e7da 100644 --- a/config/config.exs +++ b/config/config.exs @@ -130,7 +130,9 @@ config :pleroma, Pleroma.Web.Endpoint, dispatch: [ {:_, [ - {"/api/fedsocket/v1", Pleroma.Web.FedSockets.IncomingHandler, []}, + # FedSockets are commented out of the dispatch table on stable because they can't even + # fail properly when they are disabled. They will hang the connection instead of returning a 404. + # {"/api/fedsocket/v1", Pleroma.Web.FedSockets.IncomingHandler, []}, {"/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler, []}, {"/websocket", Phoenix.Endpoint.CowboyWebSocket, {Phoenix.Transports.WebSocket, diff --git a/config/description.exs b/config/description.exs index 2a1898922..fa843ea8c 100644 --- a/config/description.exs +++ b/config/description.exs @@ -275,19 +275,6 @@ config :pleroma, :config_description, [ }, %{ group: :pleroma, - key: :fed_sockets, - type: :group, - description: "Websocket based federation", - children: [ - %{ - key: :enabled, - type: :boolean, - description: "Enable FedSockets" - } - ] - }, - %{ - group: :pleroma, key: Pleroma.Emails.Mailer, type: :group, description: "Mailer-related settings", |