summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/config.exs7
-rw-r--r--config/test.exs11
2 files changed, 10 insertions, 8 deletions
diff --git a/config/config.exs b/config/config.exs
index f0b6b0363..e58454d68 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -257,8 +257,8 @@ config :pleroma, :instance,
user_name_length: 100,
max_account_fields: 10,
max_remote_account_fields: 20,
- account_field_name_length: 255,
- account_field_value_length: 255,
+ account_field_name_length: 512,
+ account_field_value_length: 512,
external_user_synchronization: true
config :pleroma, :markup,
@@ -456,6 +456,7 @@ config :pleroma, Pleroma.Web.Federator.RetryQueue,
max_retries: 5
config :pleroma_job_queue, :queues,
+ activity_expiration: 10,
federator_incoming: 50,
federator_outgoing: 50,
web_push: 50,
@@ -566,6 +567,8 @@ config :pleroma, :rate_limit,
account_confirmation_resend: {8_640_000, 5},
ap_routes: {60_000, 15}
+config :pleroma, Pleroma.ActivityExpiration, enabled: 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 30a51f734..567780987 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -86,11 +86,10 @@ config :joken, default_signer: "yU8uHKq+yyAkZ11Hx//jcdacWc8yQ1bxAAGrplzB0Zwwjkp3
config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
-try do
+if File.exists?("./config/test.secret.exs") do
import_config "test.secret.exs"
-rescue
- _ ->
- IO.puts(
- "You may want to create test.secret.exs to declare custom database connection parameters."
- )
+else
+ IO.puts(
+ "You may want to create test.secret.exs to declare custom database connection parameters."
+ )
end