From 7319c3a8584f0f00362378319ed2e7ee455e591c Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 27 May 2021 13:07:57 +0200
Subject: util.prosodyctl.check: Format, sort option listings into canonical
 form

Makes merges and diffs easier to read and deal with, especially when
using tools to gather options from the codebase.
---
 util/prosodyctl/check.lua | 42 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 8 deletions(-)

(limited to 'util/prosodyctl/check.lua')

diff --git a/util/prosodyctl/check.lua b/util/prosodyctl/check.lua
index dcb07c8f..5383d6ba 100644
--- a/util/prosodyctl/check.lua
+++ b/util/prosodyctl/check.lua
@@ -39,16 +39,42 @@ local function check(arg)
 	if not what or what == "config" then
 		print("Checking config...");
 		local deprecated = set.new({
-			"bosh_ports", "disallow_s2s", "no_daemonize", "anonymous_login", "require_encryption",
-			"vcard_compatibility", "cross_domain_bosh", "cross_domain_websocket", "daemonize",
-			"legacy_ssl_port", "legacy_ssl_ports", "legacy_ssl_interfaces", "legacy_ssl_ssl",
+			"anonymous_login",
+			"bosh_ports",
+			"cross_domain_bosh",
+			"cross_domain_websocket",
+			"daemonize",
+			"disallow_s2s",
+			"legacy_ssl_interfaces",
+			"legacy_ssl_port",
+			"legacy_ssl_ports",
+			"legacy_ssl_ssl",
+			"no_daemonize",
+			"require_encryption",
+			"vcard_compatibility",
 		});
 		local known_global_options = set.new({
-			"pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize",
-			"umask", "prosodyctl_timeout", "use_ipv6", "use_ipv4", "use_libevent", "network_settings",
-			"network_backend", "http_default_host",
-			"statistics_interval", "statistics", "statistics_config",
-			"plugin_server", "installer_plugin_path", "gc", "limits",
+			"daemonize",
+			"gc",
+			"http_default_host",
+			"installer_plugin_path",
+			"limits",
+			"log",
+			"network_backend",
+			"network_settings",
+			"pidfile",
+			"plugin_paths",
+			"plugin_server",
+			"prosodyctl_timeout",
+			"prosody_group",
+			"prosody_user",
+			"statistics",
+			"statistics_config",
+			"statistics_interval",
+			"umask",
+			"use_ipv4",
+			"use_ipv6",
+			"use_libevent",
 		});
 		local config = configmanager.getconfig();
 		-- Check that we have any global options (caused by putting a host at the top)
-- 
cgit v1.2.3