Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 0b8a75aad2dcb0c18d552c7f6bf6f239c033f655..be52576631b33e38c2cb4a75cc8b24d614c11687 100644 (file)
--- 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: [