mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

prosodyctl: Use prosody.hosts instead of _G.hosts

Browse source
This commit is contained in:
Kim Alvefur 2018-03-29 20:51:16 +02:00
parent 77fbea8cdc
commit 7af7beb0ea
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
prosodyctl
View file

@ -102,10 +102,10 @@ function commands.adduser(arg)
return 1; return 1;
end end
if not hosts[host] then if not prosody.hosts[host] then
show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host) show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
show_warning("The user will not be able to log in until this is changed."); show_warning("The user will not be able to log in until this is changed.");
hosts[host] = startup.make_host(host); --luacheck: ignore 122/hosts prosody.hosts[host] = startup.make_host(host); --luacheck: ignore 122
end end
if prosodyctl.user_exists{ user = user, host = host } then if prosodyctl.user_exists{ user = user, host = host } then
@ -141,10 +141,10 @@ function commands.passwd(arg)
return 1; return 1;
end end
if not hosts[host] then if not prosody.hosts[host] then
show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host) show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
show_warning("The user will not be able to log in until this is changed."); show_warning("The user will not be able to log in until this is changed.");
hosts[host] = startup.make_host(host); --luacheck: ignore 122/hosts prosody.hosts[host] = startup.make_host(host); --luacheck: ignore 122
end end
if not prosodyctl.user_exists { user = user, host = host } then if not prosodyctl.user_exists { user = user, host = host } then
@ -180,9 +180,9 @@ function commands.deluser(arg)
return 1; return 1;
end end
if not hosts[host] then if not prosody.hosts[host] then
show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host) show_warning("The host '%s' is not listed in the configuration file (or is not enabled).", host)
hosts[host] = startup.make_host(host); --luacheck: ignore 122/hosts prosody.hosts[host] = startup.make_host(host); --luacheck: ignore 122
end end
if not prosodyctl.user_exists { user = user, host = host } then if not prosodyctl.user_exists { user = user, host = host } then
@ -526,7 +526,7 @@ function cert_commands.config(arg)
distinguished_name = table.remove(arg); distinguished_name = table.remove(arg);
end end
local conf = openssl.config.new(); local conf = openssl.config.new();
conf:from_prosody(hosts, configmanager, arg); conf:from_prosody(prosody.hosts, configmanager, arg);
if distinguished_name then if distinguished_name then
local dn = {}; local dn = {};
for k, v in distinguished_name:gmatch("/([^=/]+)=([^/]+)") do for k, v in distinguished_name:gmatch("/([^=/]+)=([^/]+)") do
@ -751,7 +751,7 @@ function commands.cert(arg)
show_message"You need to supply at least one hostname" show_message"You need to supply at least one hostname"
arg = { "--help" }; arg = { "--help" };
end end
if arg[1] ~= "--help" and not hosts[arg[1]] then if arg[1] ~= "--help" and not prosody.hosts[arg[1]] then
show_message(error_messages["no-such-host"]); show_message(error_messages["no-such-host"]);
return 1; return 1;
end end