X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=0e91df88660a83e3a40ab91bc6dc12ff321b8a24;hb=efbc2edba17a7ee2d3e15bca5fa4f6cf8b4b5116;hp=b8f9680f0e283b7264fb94bd5def1c3d7a49335f;hpb=74f7f308f879b26a261db3b5c1d389cea898541c;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index b8f9680f0..0e91df886 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,
@@ -373,6 +373,8 @@ config :pleroma, :chat, enabled: true
 
 config :phoenix, :format_encoders, json: Jason
 
+config :phoenix, :json_library, Jason
+
 config :pleroma, :gopher,
   enabled: false,
   ip: {0, 0, 0, 0},
@@ -456,6 +458,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,
@@ -555,15 +558,13 @@ config :pleroma, :env, Mix.env()
 config :http_signatures,
   adapter: Pleroma.Signature
 
-config :pleroma, :rate_limit,
-  search: [{1000, 10}, {1000, 30}],
-  app_account_creation: {1_800_000, 25},
-  relations_actions: {10_000, 10},
-  relation_id_action: {60_000, 2},
-  statuses_actions: {10_000, 15},
-  status_id_action: {60_000, 3},
-  password_reset: {1_800_000, 5},
-  account_confirmation_resend: {8_640_000, 5}
+config :pleroma, :rate_limit, nil
+
+config :pleroma, Pleroma.ActivityExpiration, enabled: true
+
+config :pleroma, :web_cache_ttl,
+  activity_pub: nil,
+  activity_pub_question: 30_000
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.