prosodyctl: Fix copypaste error

[prosody.git] / prosodyctl

diff --git a/prosodyctl b/prosodyctl
index 1819ddd1a45bc7facf7befb82e1e5f96bfaf13b6..e26339e28ef1db0a1827230373ead4c939bf3fd0 100755 (executable)
--- a/prosodyctl
+++ b/prosodyctl
@@ -50,6 +50,7 @@ local prosody = {
        platform = "posix";
        lock_globals = function () end;
        unlock_globals = function () end;
+       installed = CFG_SOURCEDIR ~= nil;
 };
 _G.prosody = prosody;
 
@@ -119,6 +120,11 @@ end
 prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR, 
                  plugins = CFG_PLUGINDIR or "plugins", data = data_path };
 
+if prosody.installed then
+       -- Change working directory to data path.
+       require "lfs".chdir(data_path);
+end
+
 require "core.loggingmanager"
 
 dependencies.log_warnings();
@@ -155,10 +161,12 @@ if ok and pposix then
        
        -- Set our umask to protect data files
        pposix.umask(config.get("*", "core", "umask") or "027");
+       pposix.setenv("HOME", data_path);
 else
        print("Error: Unable to load pposix module. Check that Prosody is installed correctly.")
        print("For more help send the below error to us through http://prosody.im/discuss");
        print(tostring(pposix))
+       os.exit(1);
 end
 
 local function test_writeable(filename)
@@ -227,12 +235,27 @@ for hostname, config in pairs(config.getconfig()) do
        hosts[hostname] = make_host(hostname);
 end
        
-require "core.modulemanager"
+local modulemanager = require "core.modulemanager"
 
-require "util.prosodyctl"
+local prosodyctl = require "util.prosodyctl"
 require "socket"
 -----------------------
 
+ -- FIXME: Duplicate code waiting for util.startup
+function read_version()
+       -- Try to determine version
+       local version_file = io.open((CFG_SOURCEDIR or ".").."/prosody.version");
+       if version_file then
+               prosody.version = version_file:read("*a"):gsub("%s*$", "");
+               version_file:close();
+               if #prosody.version == 12 and prosody.version:match("^[a-f0-9]+$") then
+                       prosody.version = "hg:"..prosody.version;
+               end
+       else
+               prosody.version = "unknown";
+       end
+end
+
 local show_message, show_warning = prosodyctl.show_message, prosodyctl.show_warning;
 local show_usage = prosodyctl.show_usage;
 local getchar, getpass = prosodyctl.getchar, prosodyctl.getpass;
@@ -351,7 +374,7 @@ function commands.deluser(arg)
                return 1;
        end
        
-       local ok, msg = prosodyctl.passwd { user = user, host = host };
+       local ok, msg = prosodyctl.deluser { user = user, host = host };
        
        if ok then return 0; end
        
@@ -488,12 +511,13 @@ function commands.restart(arg)
 end
 
 function commands.about(arg)
+       read_version();
        if arg[1] == "--help" then
                show_usage([[about]], [[Show information about this Prosody installation]]);
                return 1;
        end
        
-       require "util.array";
+       local array = require "util.array";
        local keys = require "util.iterators".keys;
        
        print("Prosody "..(prosody.version or "(unknown version)"));
@@ -662,17 +686,19 @@ function cert_commands.key(arg)
                if ask_overwrite(key_filename) then
                        return nil, key_filename;
                end
-               os.remove(key_filename); -- We chmod this file to not have write permissions
+               os.remove(key_filename); -- This file, if it exists is unlikely to have write permissions
                local key_size = tonumber(arg[2] or show_prompt("Choose key size (2048):") or 2048);
+               local old_umask = pposix.umask("0377");
                if openssl.genrsa{out=key_filename, key_size} then
                        os.execute(("chmod 400 '%s'"):format(key_filename));
                        show_message("Key written to ".. key_filename);
+                       pposix.umask(old_umask);
                        return nil, key_filename;
                end
                show_message("There was a problem, see OpenSSL output");
        else
                show_usage("cert key HOSTNAME <bits>", "Generates a RSA key named HOSTNAME.key\n "
-               .."Promps for a key size if none given")
+               .."Prompts for a key size if none given")
        end
 end
 
@@ -698,7 +724,7 @@ function cert_commands.generate(arg)
        if #arg >= 1 and arg[1] ~= "--help" then
                local cert_filename = (CFG_DATADIR or ".") .. "/" .. arg[1] .. ".cert";
                if ask_overwrite(cert_filename) then
-                       return nil, conf_filename;
+                       return nil, cert_filename;
                end
                local _, key_filename = cert_commands.key({arg[1]});
                local _, conf_filename = cert_commands.config(arg);