diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2024-02-22 12:03:06 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2024-02-22 12:03:06 +0100 |
| commit | 05cb931e4d5e312477cc6c4cf80ab10180b84fd1 (patch) | |
| tree | 639c8a4939ece54817c89a17fed2638a99802fbc /config | |
| parent | e798be90accbc93e9c7102a51ffd2575c9e617ec (diff) | |
| parent | f0468697cd74f4ec062f9c6feda53cfbe9e4500c (diff) | |
| download | pleroma-05cb931e4d5e312477cc6c4cf80ab10180b84fd1.tar.gz pleroma-05cb931e4d5e312477cc6c4cf80ab10180b84fd1.zip | |
Merge remote-tracking branch 'origin/develop' into post-languages
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 9 | ||||
| -rw-r--r-- | config/dev.exs | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/config/config.exs b/config/config.exs index bb17ab145..435387a64 100644 --- a/config/config.exs +++ b/config/config.exs @@ -114,14 +114,7 @@ config :pleroma, :uri_schemes, config :pleroma, Pleroma.Web.Endpoint, url: [host: "localhost"], http: [ - ip: {127, 0, 0, 1}, - dispatch: [ - {:_, - [ - {"/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler, []}, - {:_, Plug.Cowboy.Handler, {Pleroma.Web.Endpoint, []}} - ]} - ] + ip: {127, 0, 0, 1} ], protocol: "https", secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl", diff --git a/config/dev.exs b/config/dev.exs index ab3e83c12..fe8de5045 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -8,8 +8,7 @@ import Config # with brunch.io to recompile .js and .css sources. config :pleroma, Pleroma.Web.Endpoint, http: [ - port: 4000, - protocol_options: [max_request_line_length: 8192, max_header_value_length: 8192] + port: 4000 ], protocol: "http", debug_errors: true, |