diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2024-02-22 11:59:15 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2024-02-22 21:05:20 +0100 |
| commit | c592a0e58d7207532f2f7be2fff788c9dc695fb5 (patch) | |
| tree | 74477cba37813c549a05d692ae04c135793496a1 /config/config.exs | |
| parent | def088ce520ffac3e200cbf63b049f1d918d2b79 (diff) | |
| parent | f0468697cd74f4ec062f9c6feda53cfbe9e4500c (diff) | |
| download | pleroma-c592a0e58d7207532f2f7be2fff788c9dc695fb5.tar.gz pleroma-c592a0e58d7207532f2f7be2fff788c9dc695fb5.zip | |
Merge remote-tracking branch 'origin/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/config/config.exs b/config/config.exs index 7ff3aaa22..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", @@ -911,6 +904,8 @@ config :pleroma, Pleroma.Application, max_restarts: 3, streamer_registry: true +config :pleroma, Pleroma.Uploaders.Uploader, timeout: 30_000 + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" |