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

1 files changed, 26 insertions, 0 deletions

diff --git a/config/description.exs b/config/description.exs
index 798cbe2ad..0b651696b 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2298,6 +2298,12 @@ config :pleroma, :config_description, [
             suggestions: [10]
           },
           %{
+            key: :backup,
+            type: :integer,
+            description: "Backup queue",
+            suggestions: [1]
+          },
+          %{
             key: :attachments_cleanup,
             type: :integer,
             description: "Attachment deletion queue",
@@ -3733,6 +3739,26 @@ config :pleroma, :config_description, [
     ]
   },
   %{
+    group: :pleroma,
+    key: Pleroma.User.Backup,
+    type: :group,
+    description: "Account Backup",
+    children: [
+      %{
+        key: :purge_after_days,
+        type: :integer,
+        description: "Remove backup achives after N days",
+        suggestions: [30]
+      },
+      %{
+        key: :limit_days,
+        type: :integer,
+        description: "Limit user to export not more often than once per N days",
+        suggestions: [7]
+      }
+    ]
+  },
+  %{
     group: :prometheus,
     key: Pleroma.Web.Endpoint.MetricsExporter,
     type: :group,