diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-11-21 10:23:53 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-11-21 10:23:53 -0600 |
| commit | 30ed7b502f5db14a4635d3d80a62df3c18b91813 (patch) | |
| tree | 84a76b9881e8545a6afc472c9c97b044735e248c /config | |
| parent | 9546c1444c2c8c4abc9bcb35b6a8ff360ddc83af (diff) | |
| parent | ecd1ef8cb5afa16dba5158e9e278a18c0856ca3e (diff) | |
| download | pleroma-30ed7b502f5db14a4635d3d80a62df3c18b91813.tar.gz pleroma-30ed7b502f5db14a4635d3d80a62df3c18b91813.zip | |
Merge remote-tracking branch 'upstream/develop' into registration-workflow
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 | ||||
| -rw-r--r-- | config/description.exs | 13 |
2 files changed, 2 insertions, 15 deletions
diff --git a/config/config.exs b/config/config.exs index 0b8a75aad..be5257663 100644 --- a/config/config.exs +++ b/config/config.exs @@ -129,7 +129,6 @@ config :pleroma, Pleroma.Web.Endpoint, dispatch: [ {:_, [ - {"/api/fedsocket/v1", Pleroma.Web.FedSockets.IncomingHandler, []}, {"/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler, []}, {"/websocket", Phoenix.Endpoint.CowboyWebSocket, {Phoenix.Transports.WebSocket, @@ -264,7 +263,8 @@ config :pleroma, :instance, length: 16 ] ], - show_reactions: true + show_reactions: true, + password_reset_token_validity: 60 * 60 * 24 config :pleroma, :welcome, direct_message: [ diff --git a/config/description.exs b/config/description.exs index 0552b37e0..a663d8127 100644 --- a/config/description.exs +++ b/config/description.exs @@ -274,19 +274,6 @@ config :pleroma, :config_description, [ }, %{ group: :pleroma, - key: :fed_sockets, - type: :group, - description: "Websocket based federation", - children: [ - %{ - key: :enabled, - type: :boolean, - description: "Enable FedSockets" - } - ] - }, - %{ - group: :pleroma, key: Pleroma.Emails.Mailer, type: :group, description: "Mailer-related settings", |