Merge branch 'fix/config-disable-chat' into 'develop'

Add config option for enabling/disabling chat.

See merge request pleroma/pleroma!58
This commit is contained in:
lambda 2018-02-08 18:18:28 +00:00
commit f0cde24f71
4 changed files with 14 additions and 3 deletions

View file

@ -1,7 +1,9 @@
defmodule Pleroma.Web.Endpoint do
use Phoenix.Endpoint, otp_app: :pleroma
socket "/socket", Pleroma.Web.UserSocket
if Application.get_env(:pleroma, :chat) |> Keyword.get(:enabled) do
socket "/socket", Pleroma.Web.UserSocket
end
socket "/api/v1", Pleroma.Web.MastodonAPI.MastodonSocket
# Serve at "/" the static files from "priv/static" directory.