Merge branch 'develop' into issue/1276

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 7c94a0f26bfaad6115fe58d92778604462982997..7f013aaad71f65d279b7f1bdb027370f17c6c0c4 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -170,7 +170,7 @@ config :mime, :types, %{
   "application/ld+json" => ["activity+json"]
 }
 
-config :tesla, adapter: Tesla.Adapter.Hackney
+config :tesla, adapter: Tesla.Adapter.Gun
 # Configures http settings, upstream proxy etc.
 config :pleroma, :http,
   proxy_url: nil,
@@ -240,6 +240,8 @@ config :pleroma, :instance,
   extended_nickname_format: true,
   cleanup_attachments: false
 
+config :pleroma, :extensions, output_relationships_in_statuses_by_default: true
+
 config :pleroma, :feed,
   post_title: %{
     max_length: 100,
@@ -482,10 +484,6 @@ config :pleroma, :workers,
     federator_outgoing: 5
   ]
 
-config :pleroma, :fetch_initial_posts,
-  enabled: false,
-  pages: 5
-
 config :auto_linker,
   opts: [
     extra: true,
@@ -607,10 +605,10 @@ config :pleroma, Pleroma.Repo,
   prepare: :unnamed
 
 config :pleroma, :connections_pool,
-  receive_connection_timeout: 250,
+  checkin_timeout: 250,
   max_connections: 250,
-  retry: 0,
-  retry_timeout: 100,
+  retry: 1,
+  retry_timeout: 1000,
   await_up_timeout: 5_000
 
 config :pleroma, :pools,
@@ -649,6 +647,11 @@ config :pleroma, :hackney_pools,
     timeout: 300_000
   ]
 
+config :pleroma, :restrict_unauthenticated,
+  timelines: %{local: false, federated: false},
+  profiles: %{local: false, remote: false},
+  activities: %{local: false, remote: false}
+
 # 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"