Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

[akkoma] / config / benchmark.exs

diff --git a/config/benchmark.exs b/config/benchmark.exs
index 62ba42e289fc4363a853bbd930b7cca36c3cf0d7..84c6782a298d985e59c5d3d118233b86aea12dbd 100644 (file)
--- a/config/benchmark.exs
+++ b/config/benchmark.exs
@@ -37,16 +37,11 @@ config :pleroma, :activitypub, sign_object_fetches: false
 # Configure your database
 config :pleroma, Pleroma.Repo,
   adapter: Ecto.Adapters.Postgres,
-  username: System.get_env("DB_USER") || "postgres",
-  database: System.get_env("DB_DATABASE") || "pleroma_test",
+  username: "postgres",
+  password: "postgres",
+  database: "pleroma_test",
   hostname: System.get_env("DB_HOST") || "localhost",
-  # username: "pleroma",
-  password:
-    System.get_env("DB_PASS") ||
-      "cAUrGezwXjRwd/lIPzZAcwjb/hiZiGi3FIaSGy9l/XsTcGA61FMy7eCBiRcg1DyQ",
-  # password: "",
-  pool_size: 10,
-  timeout: 180_000
+  pool_size: 10
 
 # Reduce hash rounds for testing
 config :pbkdf2_elixir, rounds: 1
@@ -87,3 +82,11 @@ config :pleroma, :database, rum_enabled: rum_enabled
 IO.puts("RUM enabled: #{rum_enabled}")
 
 config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
+
+if File.exists?("./config/benchmark.secret.exs") do
+  import_config "benchmark.secret.exs"
+else
+  IO.puts(
+    "You may want to create benchmark.secret.exs to declare custom database connection parameters."
+  )
+end