diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/config/config.exs b/config/config.exs index 317299bf1..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, []}} ]} ] ], @@ -164,7 +165,8 @@ config :pleroma, :instance, max_pinned_statuses: 1, no_attachment_links: false, welcome_user_nickname: nil, - welcome_message: nil + welcome_message: nil, + max_report_comment_size: 1000 config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because @@ -340,7 +342,18 @@ config :pleroma, Pleroma.Web.Federator.RetryQueue, config :pleroma, Pleroma.Jobs, federator_incoming: [max_jobs: 50], - federator_outgoing: [max_jobs: 50] + 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 + ] # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. |