diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-11-26 15:35:22 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-11-26 15:35:22 +0000 |
| commit | bb522bcc44463d258672f35979a2c939e7199e55 (patch) | |
| tree | ed0ba622a9167484011b3e335d4c688d4d13a23d | |
| parent | 2b4e3555222792a54755e8c6be7d2e8d44b1c99d (diff) | |
| parent | 94480c66078d664accc1dc3c2cdb029c327b545c (diff) | |
| download | pleroma-bb522bcc44463d258672f35979a2c939e7199e55.tar.gz | |
Merge branch 'removing-fed-sockets-settings' into 'develop'
Removing remaining fed sockets settings
See merge request pleroma/pleroma!3177
| -rw-r--r-- | config/config.exs | 10 | ||||
| -rw-r--r-- | config/test.exs | 5 |
2 files changed, 0 insertions, 15 deletions
diff --git a/config/config.exs b/config/config.exs index be5257663..f7455cf97 100644 --- 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 index 7cc660e3c..2a20a03e7 100644 --- 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, |