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

prosody/util.startup: Switch to parse_args() for --root and --config

Browse source
This commit is contained in:
Matthew Wild 2020-01-19 15:27:16 +00:00
parent ea97a0e728
commit aa2d032179
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
prosody
View file

@ -43,11 +43,7 @@ if CFG_DATADIR then
end end
end end
if #arg > 0 and arg[1] ~= "--config" then
print("Unknown command-line option: "..tostring(arg[1]));
print("Perhaps you meant to use prosodyctl instead?");
return 1;
end
local startup = require "util.startup"; local startup = require "util.startup";
local async = require "util.async"; local async = require "util.async";

12
util/startup.lua
View file

@ -70,12 +70,11 @@ function startup.read_config()
local filenames = {}; local filenames = {};
local filename; local filename;
if arg[1] == "--config" and arg[2] then if prosody.opts.config then
table.insert(filenames, arg[2]); table.insert(filenames, prosody.opts.config);
if CFG_CONFIGDIR then if CFG_CONFIGDIR then
table.insert(filenames, CFG_CONFIGDIR.."/"..arg[2]); table.insert(filenames, CFG_CONFIGDIR.."/"..prosody.opts.config);
end end
table.remove(arg, 1); table.remove(arg, 1);
elseif os.getenv("PROSODY_CONFIG") then -- Passed by prosodyctl elseif os.getenv("PROSODY_CONFIG") then -- Passed by prosodyctl
table.insert(filenames, os.getenv("PROSODY_CONFIG")); table.insert(filenames, os.getenv("PROSODY_CONFIG"));
else else
@ -459,8 +458,7 @@ function startup.switch_user()
os.exit(1); os.exit(1);
end end
prosody.current_uid = pposix.getuid(); prosody.current_uid = pposix.getuid();
local arg_root = arg[1] == "--root"; local arg_root = prosody.opts.root;
if arg_root then table.remove(arg, 1); end
if prosody.current_uid == 0 and config.get("*", "run_as_root") ~= true and not arg_root then if prosody.current_uid == 0 and config.get("*", "run_as_root") ~= true and not arg_root then
-- We haz root! -- We haz root!
local desired_user = config.get("*", "prosody_user") or "prosody"; local desired_user = config.get("*", "prosody_user") or "prosody";
@ -569,6 +567,7 @@ end
-- prosodyctl only -- prosodyctl only
function startup.prosodyctl() function startup.prosodyctl()
startup.parse_args();
startup.init_global_state(); startup.init_global_state();
startup.read_config(); startup.read_config();
startup.force_console_logging(); startup.force_console_logging();
@ -589,6 +588,7 @@ end
function startup.prosody() function startup.prosody()
-- These actions are in a strict order, as many depend on -- These actions are in a strict order, as many depend on
-- previous steps to have already been performed -- previous steps to have already been performed
startup.parse_args();
startup.init_global_state(); startup.init_global_state();
startup.read_config(); startup.read_config();
startup.init_logging(); startup.init_logging();