pleroma

commit: bb522bcc44463d258672f35979a2c939e7199e55
parent 2b4e3555222792a54755e8c6be7d2e8d44b1c99d
Author: rinpatch <rinpatch@sdf.org>
Date:   Thu, 26 Nov 2020 15:35:22 +0000

Merge branch 'removing-fed-sockets-settings' into 'develop'

Removing remaining fed sockets settings

See merge request pleroma/pleroma!3177
Diffstat:
M
config/config.exs
10
----------
M
config/test.exs
5
-----

2 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/config/config.exs b/config/config.exs
@@ -147,16 +147,6 @@ config :pleroma, Pleroma.Web.Endpoint,
     "SameSite=Lax"
   ]
 
-config :pleroma, :fed_sockets,
-  enabled: false,
-  connection_duration: :timer.hours(8),
-  rejection_duration: :timer.minutes(15),
-  fed_socket_fetches: [
-    default: 12_000,
-    interval: 3_000,
-    lazy: false
-  ]
-
 # Configures Elixir's Logger
 config :logger, :console,
   level: :debug,
diff --git a/config/test.exs b/config/test.exs
@@ -19,11 +19,6 @@ config :logger, :console,
   level: :warn,
   format: "\n[$level] $message\n"
 
-config :pleroma, :fed_sockets,
-  enabled: false,
-  connection_duration: 5,
-  rejection_duration: 5
-
 config :pleroma, :auth, oauth_consumer_strategies: []
 
 config :pleroma, Pleroma.Upload,