diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 10 | ||||
| -rw-r--r-- | config/dev.exs | 1 | ||||
| -rw-r--r-- | config/test.exs | 3 |
3 files changed, 13 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 45a22f5da..036f1ac0b 100644 --- a/config/config.exs +++ b/config/config.exs @@ -57,6 +57,15 @@ config :pleroma, :uri_schemes, # Configures the endpoint config :pleroma, Pleroma.Web.Endpoint, url: [host: "localhost"], + http: [ + dispatch: [ + {:_, + [ + {"/api/v1/streaming", Elixir.Pleroma.Web.MastodonAPI.WebsocketHandler, []}, + {:_, Plug.Adapters.Cowboy.Handler, {Pleroma.Web.Endpoint, []}} + ]} + ] + ], protocol: "https", secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl", signing_salt: "CqaoopA2", @@ -72,6 +81,7 @@ config :logger, :console, config :mime, :types, %{ "application/xml" => ["xml"], "application/xrd+xml" => ["xrd+xml"], + "application/jrd+json" => ["jrd+json"], "application/activity+json" => ["activity+json"], "application/ld+json" => ["activity+json"] } diff --git a/config/dev.exs b/config/dev.exs index 080a2f8db..8f89aa03c 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -12,6 +12,7 @@ config :pleroma, Pleroma.Web.Endpoint, protocol_options: [max_request_line_length: 8192, max_header_value_length: 8192] ], protocol: "http", + secure_cookie_flag: false, debug_errors: true, code_reloader: true, check_origin: false, diff --git a/config/test.exs b/config/test.exs index 5670e11a0..51aace407 100644 --- a/config/test.exs +++ b/config/test.exs @@ -4,7 +4,8 @@ use Mix.Config # you can enable the server option below. config :pleroma, Pleroma.Web.Endpoint, http: [port: 4001], - server: false + url: [port: 4001], + server: true # Disable captha for tests config :pleroma, Pleroma.Captcha, |