projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
certmanager: Wrap long line and add comment
[prosody.git]
/
prosodyctl
diff --git
a/prosodyctl
b/prosodyctl
index cf2ab74df253f1c850d9597acebc82ead6f82945..00aeac400752d80dce5821fe33abba154fd8ba66 100755
(executable)
--- a/
prosodyctl
+++ b/
prosodyctl
@@
-414,7
+414,11
@@
function commands.start(arg)
local ok, ret = prosodyctl.start();
if ok then
local ok, ret = prosodyctl.start();
if ok then
- if config.get("*", "daemonize") ~= false then
+ local daemonize = config.get("*", "daemonize");
+ if daemonize == nil then
+ daemonize = prosody.installed;
+ end
+ if daemonize then
local i=1;
while true do
local ok, running = prosodyctl.isrunning();
local i=1;
while true do
local ok, running = prosodyctl.isrunning();
@@
-687,7
+691,12
@@
function cert_commands.config(arg)
conf.distinguished_name[k] = nv ~= "." and nv or nil;
end
end
conf.distinguished_name[k] = nv ~= "." and nv or nil;
end
end
- local conf_file = io.open(conf_filename, "w");
+ local conf_file, err = io.open(conf_filename, "w");
+ if not conf_file then
+ show_warning("Could not open OpenSSL config file for writing");
+ show_warning(err);
+ os.exit(1);
+ end
conf_file:write(conf:serialize());
conf_file:close();
print("");
conf_file:write(conf:serialize());
conf_file:close();
print("");