diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2024-03-08 12:12:55 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2024-03-08 12:12:55 +0100 |
| commit | c0c4a9ed0d3cd154de15a8bb0767e2d4e5f4900f (patch) | |
| tree | 0641fb03061bd783a15d06633408da4aa7592e76 /config/config.exs | |
| parent | 9fc6676d8c080dbd630434275363cc6536a35116 (diff) | |
| parent | 139057f346f5903e0ed21ea91e7d43fd906fe914 (diff) | |
| download | pleroma-c0c4a9ed0d3cd154de15a8bb0767e2d4e5f4900f.tar.gz pleroma-c0c4a9ed0d3cd154de15a8bb0767e2d4e5f4900f.zip | |
Merge remote-tracking branch 'origin/develop' into instance-contact-account
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/config/config.exs b/config/config.exs index b884b3514..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", @@ -192,9 +185,6 @@ config :pleroma, :instance, federating: true, federation_incoming_replies_max_depth: 100, federation_reachability_timeout_days: 7, - federation_publisher_modules: [ - Pleroma.Web.ActivityPub.Publisher - ], allow_relay: true, public: true, quarantined_instances: [], @@ -907,6 +897,15 @@ config :pleroma, Pleroma.Search.Meilisearch, private_key: nil, initial_indexing_chunk_size: 100_000 +config :pleroma, Pleroma.Application, + background_migrators: true, + internal_fetch: true, + load_custom_modules: true, + 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" |