Software / code / prosody
Changeset
9545:9dc7280dd8dc
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 24 Oct 2018 17:18:34 +0200 |
| parents | 9542:b8bfcfbe5126 (current diff) 9544:cbd3b9d4c60b (diff) |
| children | 9546:c93496785022 |
| files | prosodyctl |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/prosodyctl Sat Oct 20 20:22:55 2018 +0200 +++ b/prosodyctl Wed Oct 24 17:18:34 2018 +0200 @@ -657,7 +657,10 @@ end assert(input:close()); assert(output:close()); - if owner and group then + if not prosody.installed then + -- FIXME this is possibly specific to GNU chown + os.execute(("chown -c --reference=%s %s"):format(sh_esc(cert_basedir), sh_esc(to))); + elseif owner and group then local ok = os.execute(("chown %s:%s %s"):format(sh_esc(owner), sh_esc(group), sh_esc(to))); assert(ok == true or ok == 0, "Failed to change ownership of "..to); end @@ -734,7 +737,8 @@ show_warning("The directory "..cert_basedir.." does not exist"); return 1; -- TODO Should we create it? end - if pposix.getuid() ~= cert_dir_attrs.uid then + local uid = pposix.getuid(); + if uid ~= 0 and uid ~= cert_dir_attrs.uid then show_warning("The directory "..cert_basedir.." is not owned by the current user, won't be able to write files to it"); return 1; elseif not cert_dir_attrs.permissions then -- COMPAT with LuaFilesystem < 1.6.2 (hey CentOS!)
