From 89f84f406c85a363e566e438802d3251bf219fa6 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 21 May 2020 16:36:13 -0500
Subject: Ensure all MediaProxy settings are grouped together

---
 config/description.exs | 76 ++++++++++++++++++++++++--------------------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/config/description.exs b/config/description.exs
index 8024a3baf..39c215b95 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1657,6 +1657,43 @@
           }
         ]
       },
+      %{
+        key: Pleroma.Web.MediaProxy.Invalidation.Http,
+        type: :group,
+        description: "MediaProxy Cache Invalidation Http Settings",
+        children: [
+          %{
+            key: :method,
+            type: :string,
+            description: "HTTP method for invalidation requests.",
+            suggestions: ["purge"]
+          },
+          %{
+            key: :headers,
+            type: :string,
+            description: "Additional HTTP headers for invalidation requests."
+          },
+          %{
+            key: :options,
+            type: :string,
+            description: "Additional HTTP request options for invalidation requests."
+          }
+        ]
+      },
+      %{
+        key: Pleroma.Web.MediaProxy.Invalidation.Script,
+        type: :group,
+        description: "MediaProxy Cache Invalidation Script Settings",
+        children: [
+          %{
+            key: :script_path,
+            type: :string,
+            description:
+              "Path to a custom script to automate cache invalidation." <>
+                "See `installation/nginx-cache-purge.sh.example` for additional help."
+          }
+        ]
+      },
       %{
         key: :proxy_opts,
         type: :keyword,
@@ -1729,45 +1766,6 @@
       }
     ]
   },
-  %{
-    group: :pleroma,
-    key: Pleroma.Web.MediaProxy.Invalidation.Http,
-    type: :group,
-    description: "MediaProxy Cache Invalidation Http Settings",
-    children: [
-      %{
-        key: :method,
-        type: :string,
-        description: "HTTP method for invalidation requests.",
-        suggestions: ["purge"]
-      },
-      %{
-        key: :headers,
-        type: :string,
-        description: "Additional HTTP headers for invalidation requests."
-      },
-      %{
-        key: :options,
-        type: :string,
-        description: "Additional HTTP request options for invalidation requests."
-      }
-    ]
-  },
-  %{
-    group: :pleroma,
-    key: Pleroma.Web.MediaProxy.Invalidation.Script,
-    type: :group,
-    description: "MediaProxy Cache Invalidation Script Settings",
-    children: [
-      %{
-        key: :script_path,
-        type: :string,
-        description:
-          "Path to a custom script to automate cache invalidation." <>
-            "See `installation/nginx-cache-purge.sh.example` for additional help."
-      }
-    ]
-  },
   %{
     group: :pleroma,
     key: :gopher,
-- 
cgit v1.2.3