diff options
| author | stwf <steven.fuchs@dockyard.com> | 2020-06-03 16:32:38 -0400 |
|---|---|---|
| committer | stwf <steven.fuchs@dockyard.com> | 2020-06-03 17:24:35 -0400 |
| commit | 5677b21e824aa7f3b5124068ef65041e04002579 (patch) | |
| tree | 43889648c280c0982b764a5f7569f26c1a735818 | |
| parent | 3b8180d7d1f52a9eae1913a59b9c970f6600e674 (diff) | |
| download | pleroma-5677b21e824aa7f3b5124068ef65041e04002579.tar.gz | |
clean up
| -rw-r--r-- | config/config.exs | 18 | ||||
| -rw-r--r-- | lib/pleroma/web/preload/status_net.ex | 2 |
2 files changed, 17 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index 0dca26152..6e75b79ec 100644 --- a/config/config.exs +++ b/config/config.exs @@ -241,7 +241,18 @@ config :pleroma, :instance, account_field_value_length: 2048, external_user_synchronization: true, extended_nickname_format: true, - cleanup_attachments: false + cleanup_attachments: false, + multi_factor_authentication: [ + totp: [ + # digits 6 or 8 + digits: 6, + period: 30 + ], + backup_codes: [ + number: 5, + length: 16 + ] + ] config :pleroma, :feed, post_title: %{ @@ -350,7 +361,8 @@ config :pleroma, :mrf_simple, reject: [], accept: [], avatar_removal: [], - banner_removal: [] + banner_removal: [], + reject_deletes: [] config :pleroma, :mrf_keyword, reject: [], @@ -678,6 +690,8 @@ config :pleroma, :restrict_unauthenticated, profiles: %{local: false, remote: false}, activities: %{local: false, remote: false} +config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: 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" diff --git a/lib/pleroma/web/preload/status_net.ex b/lib/pleroma/web/preload/status_net.ex index 7e592d60d..367442d5c 100644 --- a/lib/pleroma/web/preload/status_net.ex +++ b/lib/pleroma/web/preload/status_net.ex @@ -3,8 +3,8 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.Preload.Providers.StatusNet do - alias Pleroma.Web.TwitterAPI.UtilView alias Pleroma.Web.Preload.Providers.Provider + alias Pleroma.Web.TwitterAPI.UtilView @behaviour Provider @config_url :"/api/statusnet/config.json" |