From: Andrew Lewis <nerf@judo.za.org>
Date: Wed, 28 Feb 2018 10:49:09 +0000 (+0200)
Subject: [Minor] Config wizard: fix paths
X-Git-Tag: 1.7.0~102^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b057634b9f1f5142d4be7309e945c87c3ddb8469;p=rspamd.git

[Minor] Config wizard: fix paths
---

diff --git a/lualib/rspamadm/configwizard.lua b/lualib/rspamadm/configwizard.lua
index f4feab9e7..31c78a668 100644
--- a/lualib/rspamadm/configwizard.lua
+++ b/lualib/rspamadm/configwizard.lua
@@ -77,7 +77,7 @@ end
 local function print_changes(changes)
   local function print_change(k, c, where)
     printf('File: %s, changes list:', highlight(local_conf .. '/'
-        .. where .. '/'.. k .. '.conf'))
+        .. where .. '/'.. k))
 
     for ek,ev in pairs(c) do
       printf("%s => %s", highlight(ek), rspamd_logger.slog("%s", ev))
@@ -103,7 +103,7 @@ local function apply_changes(changes)
   end
 
   local function apply_change(k, c, where)
-    local fname = local_conf .. '/' .. where .. '/'.. k .. '.conf'
+    local fname = local_conf .. '/' .. where .. '/'.. k
 
     if not rspamd_util.file_exists(fname) then
       printf("Create file %s", highlight(fname))
@@ -340,12 +340,12 @@ local function check_redis_classifier(cls, changes)
         printf("Conversion failed")
       else
         printf("Conversion succeed")
-        changes.l['classifier_bayes'] = {
+        changes.l['classifier-bayes.conf'] = {
           new_schema = true,
         }
 
         if expire then
-          changes.l['classifier_bayes'].expire = expire
+          changes.l['classifier-bayes.conf'].expire = expire
         end
       end
     end
@@ -402,13 +402,13 @@ return ttl
           symbol_ham, symbol_spam)
 
       if ask_yes_no("Switch config to the new schema?", true) then
-        changes.l['classifier_bayes'] = {
+        changes.l['classifier-bayes.conf'] = {
           new_schema = true,
         }
 
         local expire = check_expire()
         if expire then
-          changes.l['classifier_bayes'].expire = expire
+          changes.l['classifier-bayes.conf'].expire = expire
         end
       end
     end
@@ -452,17 +452,17 @@ local function setup_statistic(cfg, changes)
             return false
           end
           rspamd_logger.messagex('Converted classifier to the from sqlite to redis')
-          changes.l['classifier_bayes'] = {
+          changes.l['classifier-bayes.conf'] = {
             backend = 'redis',
             new_schema = true,
           }
 
           if expire then
-            changes.l['classifier_bayes'].expire = expire
+            changes.l['classifier-bayes.conf'].expire = expire
           end
 
           if cls.learn_cache then
-            changes.l['classifier_bayes'].cache = {
+            changes.l['classifier-bayes.conf'].cache = {
               backend = 'redis'
             }
           end