projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'cycles-gun' into 'develop'
[akkoma]
/
config
/
benchmark.exs
diff --git
a/config/benchmark.exs
b/config/benchmark.exs
index dd99cf5fd81e9ac11de7a7a81d8f07db4b9edb6c..a4d048f1bb0a91dc89daeb5812a73ffe456f23b7 100644
(file)
--- a/
config/benchmark.exs
+++ b/
config/benchmark.exs
@@
-1,4
+1,4
@@
-
use Mix.
Config
+
import
Config
# We don't run a server during test. If one is required,
# you can enable the server option below.
# We don't run a server during test. If one is required,
# you can enable the server option below.
@@
-39,7
+39,7
@@
config :pleroma, Pleroma.Repo,
adapter: Ecto.Adapters.Postgres,
username: "postgres",
password: "postgres",
adapter: Ecto.Adapters.Postgres,
username: "postgres",
password: "postgres",
- database: "pleroma_
test
",
+ database: "pleroma_
benchmark
",
hostname: System.get_env("DB_HOST") || "localhost",
pool_size: 10
hostname: System.get_env("DB_HOST") || "localhost",
pool_size: 10
@@
-59,10
+59,6
@@
config :web_push_encryption, :vapid_details,
"BLH1qVhJItRGCfxgTtONfsOKDc9VRAraXw-3NsmjMngWSh7NxOizN6bkuRA7iLTMPS82PjwJAr3UoK9EC1IFrz4",
private_key: "_-XZ0iebPrRfZ_o0-IatTdszYa8VCH1yLN-JauK7HHA"
"BLH1qVhJItRGCfxgTtONfsOKDc9VRAraXw-3NsmjMngWSh7NxOizN6bkuRA7iLTMPS82PjwJAr3UoK9EC1IFrz4",
private_key: "_-XZ0iebPrRfZ_o0-IatTdszYa8VCH1yLN-JauK7HHA"
-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,
@@
-82,3
+78,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