diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-12-17 19:30:05 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-12-17 19:30:05 +0000 |
| commit | 078b8b6d228bee28697fda4bbefe65736f8b0d3c (patch) | |
| tree | 5ab5ffc319a32beaa954af9f6f216642651c444d /config | |
| parent | 567359790ea623949585629c41580961c59a01ff (diff) | |
| parent | ba9ef77b6ae7fd6ade9eb87a418f9c87c7d94647 (diff) | |
| download | pleroma-078b8b6d228bee28697fda4bbefe65736f8b0d3c.tar.gz pleroma-078b8b6d228bee28697fda4bbefe65736f8b0d3c.zip | |
Merge branch 'phoenix14' into 'develop'
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 9 | ||||
| -rw-r--r-- | config/test.exs | 3 |
2 files changed, 11 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/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 |