diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-08 21:37:55 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-08 21:37:55 +0300 |
| commit | b2924ab1fbba4e6add15030cf8444d2d3f0cfe0c (patch) | |
| tree | 000420341c4397cb7e380ff6fa52bb023700476a /config/config.exs | |
| parent | d5cdc907e3fda14c2ce78ddbb124739441330ecc (diff) | |
| parent | 570940a3fd8d5a2fb600656432dfc01304161221 (diff) | |
| download | pleroma-b2924ab1fbba4e6add15030cf8444d2d3f0cfe0c.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index d698e6028..c51884f3a 100644 --- a/config/config.exs +++ b/config/config.exs @@ -238,7 +238,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: %{ @@ -560,8 +571,6 @@ config :pleroma, :email_notifications, inactivity_threshold: 7 } -config :pleroma, :notifications, enable_follow_request_notifications: false - config :pleroma, :oauth2, token_expires_in: 600, issue_new_refresh_token: true, @@ -653,6 +662,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" |