summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2024-01-21 00:54:25 +0000
committerfeld <feld@feld.me>2024-01-21 00:54:25 +0000
commit1edfce43226923f5ace0f52b6669e96fdae13732 (patch)
treef7a685dc61551c9a71acc327d40db6a98d7188b7 /config
parent3c65a2899dd6993e64221f8e48ec0c9431bd6a81 (diff)
parentdcd010280034fd35254906831402d96fd59f8098 (diff)
downloadpleroma-1edfce43226923f5ace0f52b6669e96fdae13732.tar.gz
pleroma-1edfce43226923f5ace0f52b6669e96fdae13732.zip
Merge branch 'dialyzer-fixes' into 'develop'
Dialyzer fixes See merge request pleroma/pleroma!4035
Diffstat (limited to 'config')
-rw-r--r--config/benchmark.exs4
-rw-r--r--config/config.exs7
-rw-r--r--config/test.exs8
3 files changed, 19 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..7ff3aaa22 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -904,6 +904,13 @@ 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
+
# 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..28d0364c6 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -162,6 +162,14 @@ 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
+
if File.exists?("./config/test.secret.exs") do
import_config "test.secret.exs"
else