Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'

[akkoma] / config / description.exs

diff --git a/config/description.exs b/config/description.exs
index c509109115b79564f6f1a057776d261d00014f1e..5e08ba109d98b898d9a63c35e382a8d4ff68aca1 100644 (file)
--- a/config/description.exs
+++ b/config/description.exs
@@ -12,20 +12,35 @@ websocket_config = [
   compress: false
 ]
 
-frontend_options = [
+installed_frontend_options = [
   %{
     key: "name",
     label: "Name",
     type: :string,
     description:
-      "Name of the frontend. Valid config must include both `Name` and `Reference` values."
+      "Name of the installed frontend. Valid config must include both `Name` and `Reference` values."
   },
   %{
     key: "ref",
     label: "Reference",
     type: :string,
     description:
-      "Reference of the frontend to be used. Valid config must include both `Name` and `Reference` values."
+      "Reference of the installed frontend to be used. Valid config must include both `Name` and `Reference` values."
+  }
+]
+
+frontend_options = [
+  %{
+    key: "name",
+    label: "Name",
+    type: :string,
+    description: "Name of the frontend."
+  },
+  %{
+    key: "ref",
+    label: "Reference",
+    type: :string,
+    description: "Reference of the frontend to be used."
   },
   %{
     key: "git",
@@ -2370,6 +2385,13 @@ config :pleroma, :config_description, [
         suggestions: [
           Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl
         ]
+      },
+      %{
+        key: :failure_backoff,
+        type: :integer,
+        description:
+          "Amount of milliseconds after request failure, during which the request will not be retried.",
+        suggestions: [60_000]
       }
     ]
   },
@@ -3587,13 +3609,13 @@ config :pleroma, :config_description, [
         key: :primary,
         type: :map,
         description: "Primary frontend, the one that is served for all pages by default",
-        children: frontend_options
+        children: installed_frontend_options
       },
       %{
         key: :admin,
         type: :map,
         description: "Admin frontend",
-        children: frontend_options
+        children: installed_frontend_options
       },
       %{
         key: :available,