diff options
| author | link0ff <juri@linkov.net> | 2019-03-03 18:29:37 +0200 |
|---|---|---|
| committer | link0ff <juri@linkov.net> | 2019-03-03 18:29:37 +0200 |
| commit | 19e2b852473ea4d371fb3d77e9344025e0499428 (patch) | |
| tree | dcd43e823f7687767651e6eb0877b5b4aca53882 /config/config.exs | |
| parent | e278d470232f4e8081bbbe358137400074673e75 (diff) | |
| parent | ace4231628ad1af08c8696fb7fe6983549f62631 (diff) | |
| download | pleroma-19e2b852473ea4d371fb3d77e9344025e0499428.tar.gz pleroma-19e2b852473ea4d371fb3d77e9344025e0499428.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs index 28d93e086..8544dcc0d 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, []}} ]} ] ], @@ -344,6 +345,16 @@ config :pleroma, Pleroma.Jobs, federator_outgoing: [max_jobs: 50], mailer: [max_jobs: 10] +config :auto_linker, + opts: [ + scheme: true, + extra: true, + class: false, + strip_prefix: false, + new_window: false, + rel: false + ] + config :pleroma, :ldap, enabled: System.get_env("LDAP_ENABLED") == "true", host: System.get_env("LDAP_HOST") || "localhost", |