diff options
| author | marcin mikołajczak <me@mkljczk.pl> | 2024-02-02 17:13:15 +0000 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2024-02-02 18:55:37 +0100 |
| commit | e798be90accbc93e9c7102a51ffd2575c9e617ec (patch) | |
| tree | a8457757821ed028bd0517e7ace16e8c8ede9f4f /config | |
| parent | 250a4873a6f50f71cb5c387de46d711dc1bd1a39 (diff) | |
| parent | 3b9d991514e53ad8f442ffc674dd9b1422fdc415 (diff) | |
| download | pleroma-e798be90accbc93e9c7102a51ffd2575c9e617ec.tar.gz pleroma-e798be90accbc93e9c7102a51ffd2575c9e617ec.zip | |
Merge branch 'develop' into 'post-languages'
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Diffstat (limited to 'config')
| -rw-r--r-- | config/benchmark.exs | 4 | ||||
| -rw-r--r-- | config/config.exs | 9 | ||||
| -rw-r--r-- | config/test.exs | 12 |
3 files changed, 25 insertions, 0 deletions
diff --git a/config/benchmark.exs b/config/benchmark.exs index e3e1118ed..d30c95946 100644 --- a/config/benchmark.exs +++ b/config/benchmark.exs @@ -79,6 +79,10 @@ IO.puts("RUM enabled: #{rum_enabled}") config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock +config :pleroma, Pleroma.Application, + background_migrators: false, + streamer_registry: false + if File.exists?("./config/benchmark.secret.exs") do import_config "benchmark.secret.exs" else diff --git a/config/config.exs b/config/config.exs index d8f9eb22e..bb17ab145 100644 --- a/config/config.exs +++ b/config/config.exs @@ -904,6 +904,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" diff --git a/config/test.exs b/config/test.exs index 60cdacb0e..9d752bdf8 100644 --- a/config/test.exs +++ b/config/test.exs @@ -162,6 +162,18 @@ peer_module = config :pleroma, Pleroma.Cluster, peer_module: peer_module +config :pleroma, Pleroma.Application, + background_migrators: false, + internal_fetch: false, + load_custom_modules: false, + max_restarts: 100, + streamer_registry: false, + test_http_pools: true + +config :pleroma, Pleroma.Uploaders.Uploader, timeout: 1_000 + +config :pleroma, Pleroma.Emoji.Loader, test_emoji: true + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |