Browse Source

Apply suggestions from code review

Co-authored-by: Vsevolod Stakhov <vsevolod@rspamd.com>
tags/3.7.1
LaoDC 10 months ago
parent
commit
6c3d5c7db8
No account linked to committer's email address
2 changed files with 6 additions and 6 deletions
  1. 1
    1
      lualib/lua_redis.lua
  2. 5
    5
      lualib/rspamadm/configwizard.lua

+ 1
- 1
lualib/lua_redis.lua View File

@@ -37,7 +37,7 @@ local common_schema = {
sentinel_watch_time = (ts.number + ts.string / lutil.parse_time_interval):is_optional():describe("Sentinel watch time"),
sentinel_masters_pattern = ts.string:is_optional():describe("Sentinel masters pattern"),
sentinel_master_maxerrors = (ts.number + ts.string / tonumber):is_optional():describe("Sentinel master max errors"),
sentinel_username = ts.string:is_optional():describe("sentinel username"),
sentinel_username = ts.string:is_optional():describe("Sentinel username"),
sentinel_password = ts.string:is_optional():describe("Sentinel password"),
}


+ 5
- 5
lualib/rspamadm/configwizard.lua View File

@@ -249,12 +249,12 @@ local function setup_redis(cfg, changes)
redis_params['write_servers'] = ws
end

if ask_yes_no('Do you have any username set for your Redis?') then
local usernm = readline_default("Enter Redis username:", nil)
if ask_yes_no('Do you have any username set for your Redis (ACL SETUSER and Redis 6.0+)') then
local username = readline_default("Enter Redis username:", nil)

if usernm then
changes.l['redis.conf']['username'] = usernm
redis_params['username'] = usernm
if username then
changes.l['redis.conf'].username = username
redis_params.username = username
end

local passwd = readline_default("Enter Redis password:", nil)

Loading…
Cancel
Save