From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sun, 3 Dec 2017 16:54:46 +0000 (+0000)
Subject: [Minor] Tell which modules will be enabled if Rejdis is added
X-Git-Tag: 1.7.0~373
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05074e93f7e377d71a50969f4821108aa25f1faa;p=thirdparty%2Frspamd.git

[Minor] Tell which modules will be enabled if Rejdis is added
---

diff --git a/lualib/rspamadm/configwizard.lua b/lualib/rspamadm/configwizard.lua
index 40546e32f2..06e688c07e 100644
--- a/lualib/rspamadm/configwizard.lua
+++ b/lualib/rspamadm/configwizard.lua
@@ -142,9 +142,14 @@ local function setup_redis(cfg, changes)
     return ls
   end
 
-  printf("Setup %s for storage:", highlight("Redis"))
+  printf("%s servers are not set:", highlight("Redis"))
+  printf("The following modules will be enabled if you add Redis servers:")
 
-  if ask_yes_no("Redis servers are not set, do you wish to set them?", true) then
+  for k,_ in pairs(rspamd_plugins_state.disabled_redis) do
+    printf("\t* %s", highlight(k))
+  end
+
+  if ask_yes_no("Do you wish to set Redis servers?", true) then
     local read_servers = rspamd_util.readline("Input read only servers separated by `,` [default: localhost]: ")
 
     if not read_servers or #read_servers == 0 then
diff --git a/lualib/rspamadm/plugins_stats.lua b/lualib/rspamadm/plugins_stats.lua
index 465396a2aa..de4aec2c8e 100644
--- a/lualib/rspamadm/plugins_stats.lua
+++ b/lualib/rspamadm/plugins_stats.lua
@@ -35,6 +35,8 @@ end
 
 return function(args, _)
   print_plugins_table(rspamd_plugins_state.enabled, "enabled")
+  print_plugins_table(rspamd_plugins_state.disabled_explicitly,
+    "disabled (explicitly)")
   print_plugins_table(rspamd_plugins_state.disabled_unconfigured,
     "disabled (unconfigured)")
   print_plugins_table(rspamd_plugins_state.disabled_redis,