From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 22 Feb 2018 15:28:50 +0000 (+0000)
Subject: [Minor] Fix setting of the Lua path
X-Git-Tag: 1.7.0~148
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=232f42e120181033518d4e04445687407dcea161;p=rspamd.git

[Minor] Fix setting of the Lua path
---

diff --git a/src/rspamadm/configwizard.c b/src/rspamadm/configwizard.c
index 6ff5d256e..bd8ccefbd 100644
--- a/src/rspamadm/configwizard.c
+++ b/src/rspamadm/configwizard.c
@@ -51,13 +51,14 @@ rspamadm_configwizard_help (gboolean full_help)
 	const char *help_str;
 
 	if (full_help) {
-		help_str = "Perform initial configuration for Rspamd daemon\n\n"
-				"Usage: rspamadm configwizard [-c <config_name>]\n"
+		help_str = "Perform guided configuration for Rspamd daemon\n\n"
+				"Usage: rspamadm configwizard [-c <config_name>] [checks...]\n"
+		 		"       rspamadm configwizard [-c <config_name>] list\n"
 				"Where options are:\n\n"
 				"--help: shows available options and commands";
 	}
 	else {
-		help_str = "Perform initial configuration for Rspamd daemon";
+		help_str = "Perform guided configuration for Rspamd daemon";
 	}
 
 	return help_str;
@@ -91,10 +92,9 @@ rspamadm_configwizard (gint argc, gchar **argv)
 	gboolean ret = TRUE;
 	worker_t **pworker;
 	lua_State *L;
-	gint i;
 
 	context = g_option_context_new (
-			"keypair - create encryption keys");
+			"configwizard - perform guided configuration");
 	g_option_context_set_summary (context,
 			"Summary:\n  Rspamd administration utility version "
 					RVERSION
@@ -148,6 +148,7 @@ rspamadm_configwizard (gint argc, gchar **argv)
 
 	if (ret) {
 		L = cfg->lua_state;
+		rspamd_lua_set_path (L, cfg->rcl_obj, ucl_vars);
 		ucl_object_insert_key (cfg->rcl_obj, ucl_object_fromstring (cfg->cfg_name),
 				"config_path", 0, false);