projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'
[akkoma]
/
config
/
test.exs
diff --git
a/config/test.exs
b/config/test.exs
index b48b89c8fffd5a2e980f424146970cfde526b7ec..b8ea63c9435f785321e943e47ff455a587f43287 100644
(file)
--- a/
config/test.exs
+++ b/
config/test.exs
@@
-66,22
+66,15
@@
config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock
config :pleroma, Oban,
queues: false,
config :pleroma, Oban,
queues: false,
- prune: :disabled
-
-config :pleroma, Pleroma.Scheduler,
- jobs: [],
- global: false
+ prune: :disabled,
+ crontab: false
config :pleroma, Pleroma.ScheduledActivity,
daily_user_limit: 2,
total_user_limit: 3,
enabled: false
config :pleroma, Pleroma.ScheduledActivity,
daily_user_limit: 2,
total_user_limit: 3,
enabled: false
-config :pleroma, :rate_limit,
- search: [{1000, 30}, {1000, 30}],
- app_account_creation: {10_000, 5},
- password_reset: {1000, 30},
- ap_routes: nil
+config :pleroma, :rate_limit, %{}
config :pleroma, :http_security, report_uri: "https://endpoint.com"
config :pleroma, :http_security, report_uri: "https://endpoint.com"
@@
-95,7
+88,11
@@
config :joken, default_signer: "yU8uHKq+yyAkZ11Hx//jcdacWc8yQ1bxAAGrplzB0Zwwjkp3
config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
-config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
+config :pleroma, :modules, runtime_dir: "test/fixtures/modules"
+
+config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: true
+
+config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false
if File.exists?("./config/test.secret.exs") do
import_config "test.secret.exs"
if File.exists?("./config/test.secret.exs") do
import_config "test.secret.exs"