From 89f84f406c85a363e566e438802d3251bf219fa6 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Thu, 21 May 2020 16:36:13 -0500 Subject: [PATCH] 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 @@ -1658,6 +1658,43 @@ config :pleroma, :config_description, [ ] }, %{ + 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, description: "Options for Pleroma.ReverseProxy", @@ -1731,45 +1768,6 @@ config :pleroma, :config_description, [ }, %{ 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, type: :group, description: "Gopher settings",