projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/twitter-rich-media-preview' into 'develop'
[akkoma]
/
config
/
benchmark.exs
diff --git
a/config/benchmark.exs
b/config/benchmark.exs
index 62ba42e289fc4363a853bbd930b7cca36c3cf0d7..e867253ebd021925f4bb11eec6d34a1a9f7c27e1 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,
# 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_benchmark",
hostname: System.get_env("DB_HOST") || "localhost",
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
# Reduce hash rounds for testing
config :pbkdf2_elixir, rounds: 1
@@
-66,8
+61,6
@@
config :web_push_encryption, :vapid_details,
config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock
config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock
-config :pleroma_job_queue, disabled: true
-
config :pleroma, Pleroma.ScheduledActivity,
daily_user_limit: 2,
total_user_limit: 3,
config :pleroma, Pleroma.ScheduledActivity,
daily_user_limit: 2,
total_user_limit: 3,
@@
-87,3
+80,11
@@
config :pleroma, :database, rum_enabled: rum_enabled
IO.puts("RUM enabled: #{rum_enabled}")
config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
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