summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/config.exs9
-rw-r--r--config/dev.exs1
-rw-r--r--config/test.exs3
3 files changed, 12 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index 1777a54c0..df6ea09ae 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -50,6 +50,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",
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 5c6acfead..8f4a2dc17 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
# Print only warnings and errors during test
config :logger, level: :warn