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

prosody, prosodyctl: Remove last trace of "core" \o/

Browse source
This commit is contained in:
Kim Alvefur 2013-03-23 15:00:49 +01:00
parent 6aa6f988a6
commit 2e91cb38d9
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
prosody
View file

@ -207,8 +207,8 @@ function init_global_state()
prosody.full_sessions = full_sessions; prosody.full_sessions = full_sessions;
prosody.hosts = hosts; prosody.hosts = hosts;
local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data"; local data_path = config.get("*", "data_path") or CFG_DATADIR or "data";
local custom_plugin_paths = config.get("*", "core", "plugin_paths"); local custom_plugin_paths = config.get("*", "plugin_paths");
if custom_plugin_paths then if custom_plugin_paths then
local path_sep = package.config:sub(3,3); local path_sep = package.config:sub(3,3);
-- path1;path2;path3;defaultpath... -- path1;path2;path3;defaultpath...

18
prosodyctl
View file

@ -109,11 +109,11 @@ do
os.exit(1); os.exit(1);
end end
end end
local original_logging_config = config.get("*", "core", "log"); local original_logging_config = config.get("*", "log");
config.set("*", "core", "log", { { levels = { min="info" }, to = "console" } }); config.set("*", "log", { { levels = { min="info" }, to = "console" } });
local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data"; local data_path = config.get("*", "data_path") or CFG_DATADIR or "data";
local custom_plugin_paths = config.get("*", "core", "plugin_paths"); local custom_plugin_paths = config.get("*", "plugin_paths");
if custom_plugin_paths then if custom_plugin_paths then
local path_sep = package.config:sub(3,3); local path_sep = package.config:sub(3,3);
-- path1;path2;path3;defaultpath... -- path1;path2;path3;defaultpath...
@ -142,8 +142,8 @@ if ok and pposix then
current_uid = pposix.getuid(); current_uid = pposix.getuid();
if current_uid == 0 then if current_uid == 0 then
-- We haz root! -- We haz root!
local desired_user = config.get("*", "core", "prosody_user") or "prosody"; local desired_user = config.get("*", "prosody_user") or "prosody";
local desired_group = config.get("*", "core", "prosody_group") or desired_user; local desired_group = config.get("*", "prosody_group") or desired_user;
local ok, err = pposix.setgid(desired_group); local ok, err = pposix.setgid(desired_group);
if ok then if ok then
ok, err = pposix.initgroups(desired_user); ok, err = pposix.initgroups(desired_user);
@ -162,7 +162,7 @@ if ok and pposix then
end end
-- Set our umask to protect data files -- Set our umask to protect data files
pposix.umask(config.get("*", "core", "umask") or "027"); pposix.umask(config.get("*", "umask") or "027");
pposix.setenv("HOME", data_path); pposix.setenv("HOME", data_path);
pposix.setenv("PROSODY_CONFIG", ENV_CONFIG); pposix.setenv("PROSODY_CONFIG", ENV_CONFIG);
else else
@ -267,7 +267,7 @@ local show_yesno = prosodyctl.show_yesno;
local show_prompt = prosodyctl.show_prompt; local show_prompt = prosodyctl.show_prompt;
local read_password = prosodyctl.read_password; local read_password = prosodyctl.read_password;
local prosodyctl_timeout = (config.get("*", "core", "prosodyctl_timeout") or 5) * 2; local prosodyctl_timeout = (config.get("*", "prosodyctl_timeout") or 5) * 2;
----------------------- -----------------------
local commands = {}; local commands = {};
local command = arg[1]; local command = arg[1];
@ -410,7 +410,7 @@ function commands.start(arg)
local ok, ret = prosodyctl.start(); local ok, ret = prosodyctl.start();
if ok then if ok then
if config.get("*", "core", "daemonize") ~= false then if config.get("*", "daemonize") ~= false then
local i=1; local i=1;
while true do while true do
local ok, running = prosodyctl.isrunning(); local ok, running = prosodyctl.isrunning();