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

util.startup: Don't create installer plugin path (as root)

Browse source 
Since this runs before dropping root, the directory ends up being owned
by root, resulting in luarocks failing to install anything, since by
then it would be running as the prosody user.

luarocks creates this directory if needed, so creating it during startup
is not necessary.

One potential issue is if the directory is somewhere where Prosody can't
write, but then you will simply have to create it yourself with the
appropriate permissions.
This commit is contained in:
Kim Alvefur 2021-01-24 15:57:48 +01:00
parent 4825d991dc
commit 27c7ee73b7
1 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
util/startup.lua
View file

@ -271,8 +271,6 @@ function startup.setup_plugin_install_path()
local path_sep = package.config:sub(3,3); local path_sep = package.config:sub(3,3);
-- TODO Figure out what this should be relative to, because CWD could be anywhere -- TODO Figure out what this should be relative to, because CWD could be anywhere
installer_plugin_path = config.resolve_relative_path(require "lfs".currentdir(), installer_plugin_path); installer_plugin_path = config.resolve_relative_path(require "lfs".currentdir(), installer_plugin_path);
-- TODO Can probably move directory creation to the install command
require "lfs".mkdir(installer_plugin_path);
require"util.paths".complement_lua_path(installer_plugin_path); require"util.paths".complement_lua_path(installer_plugin_path);
-- luacheck: ignore 111 -- luacheck: ignore 111
CFG_PLUGINDIR = installer_plugin_path..path_sep..(CFG_PLUGINDIR or "plugins"); CFG_PLUGINDIR = installer_plugin_path..path_sep..(CFG_PLUGINDIR or "plugins");