aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2017-12-03 16:54:46 +0000
committerVsevolod Stakhov <vsevolod@highsecure.ru>2017-12-03 16:55:30 +0000
commit05074e93f7e377d71a50969f4821108aa25f1faa (patch)
tree6555d3cdd2f205e02611bc4fb5f10f51d8a09ad5
parent59ada6874d061e8b87b3115a3ef60b66321c9a01 (diff)
downloadrspamd-05074e93f7e377d71a50969f4821108aa25f1faa.tar.gz
rspamd-05074e93f7e377d71a50969f4821108aa25f1faa.zip
[Minor] Tell which modules will be enabled if Rejdis is added
-rw-r--r--lualib/rspamadm/configwizard.lua9
-rw-r--r--lualib/rspamadm/plugins_stats.lua2
2 files changed, 9 insertions, 2 deletions
diff --git a/lualib/rspamadm/configwizard.lua b/lualib/rspamadm/configwizard.lua
index 40546e32f..06e688c07 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 465396a2a..de4aec2c8 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,