projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
certmanager: Remove debug logging accidentally committed
[prosody.git]
/
util
/
prosodyctl.lua
diff --git
a/util/prosodyctl.lua
b/util/prosodyctl.lua
index 7ce6c513bc61c0f682d2b022c55e983f28c7a2f9..7f3ce20e028ac811eeaa9564592f561b9f98783f 100644
(file)
--- a/
util/prosodyctl.lua
+++ b/
util/prosodyctl.lua
@@
-1,6
+1,6
@@
-- Prosody IM
-- Prosody IM
--- Copyright (C) 2008-20
09
Matthew Wild
--- Copyright (C) 2008-20
09
Waqas Hussain
+-- Copyright (C) 2008-20
10
Matthew Wild
+-- Copyright (C) 2008-20
10
Waqas Hussain
--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
@@
-21,6
+21,8
@@
local tostring, tonumber = tostring, tonumber;
local CFG_SOURCEDIR = _G.CFG_SOURCEDIR;
local CFG_SOURCEDIR = _G.CFG_SOURCEDIR;
+local prosody = prosody;
+
module "prosodyctl"
function adduser(params)
module "prosodyctl"
function adduser(params)
@@
-30,6
+32,11
@@
function adduser(params)
elseif not host then
return false, "invalid-hostname";
end
elseif not host then
return false, "invalid-hostname";
end
+
+ local provider = prosody.hosts[host].users;
+ if not(provider) or provider.name == "null" then
+ usermanager.initialize_host(host);
+ end
local ok = usermanager.create_user(user, password, host);
if not ok then
local ok = usermanager.create_user(user, password, host);
if not ok then
@@
-39,6
+46,11
@@
function adduser(params)
end
function user_exists(params)
end
function user_exists(params)
+ local provider = prosody.hosts[params.host].users;
+ if not(provider) or provider.name == "null" then
+ usermanager.initialize_host(params.host);
+ end
+
return usermanager.user_exists(params.user, params.host);
end
return usermanager.user_exists(params.user, params.host);
end
@@
-109,10
+121,8
@@
function start()
end
if not CFG_SOURCEDIR then
os.execute("./prosody");
end
if not CFG_SOURCEDIR then
os.execute("./prosody");
- elseif CFG_SOURCEDIR:match("^/usr/local") then
- os.execute("/usr/local/bin/prosody");
else
else
- os.execute(
"
prosody");
+ os.execute(
CFG_SOURCEDIR.."/../../bin/
prosody");
end
return true;
end
end
return true;
end