|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
Hack by Robert Scheck <robert@fedoraproject.org> for prosody >= 0.11.7 which removes the
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
service_command_warning() function for EPEL 6, because the SysVinit script actually uses
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
this functionality.
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
--- prosody-0.11.7/prosodyctl 2020-05-31 22:39:34.000000000 +0200
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
+++ prosody-0.11.7/prosodyctl.epel6 2020-10-01 22:57:47.161806878 +0200
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
@@ -199,26 +199,11 @@
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
return 1;
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
end
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
-local function service_command_warning(service_command)
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
- if prosody.installed and configmanager.get("*", "prosodyctl_service_warnings") ~= false then
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
- show_warning("WARNING: Use of prosodyctl start/stop/restart/reload is not recommended");
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
- show_warning(" if Prosody is managed by an init system - use that directly instead.");
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
- lfs = lfs or require
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
- if lfs.attributes("/etc/systemd") then
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
- show_warning(" e.g. systemctl %s prosody", service_command);
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
- elseif lfs.attributes("/etc/init.d/prosody") then
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
- show_warning(" e.g. /etc/init.d/prosody %s", service_command);
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
- end
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
- show_warning("");
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
- end
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
-end
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
-
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
function commands.start(arg)
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
if arg[1] == "--help" then
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
show_usage([[start]], [[Start Prosody]]);
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
return 1;
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
end
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
- service_command_warning("start");
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
local ok, ret = prosodyctl.isrunning();
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
if not ok then
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
show_message(error_messages[ret]);
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
@@ -309,8 +294,6 @@
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
return 1;
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
end
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
- service_command_warning("stop");
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
-
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
if not prosodyctl.isrunning() then
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
show_message("Prosody is not running");
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
return 1;
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
@@ -346,8 +329,6 @@
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
return 1;
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
end
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
- service_command_warning("restart");
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
-
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
commands.stop(arg);
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
return commands.start(arg);
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
end
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
@@ -441,8 +422,6 @@
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
return 1;
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
end
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
- service_command_warning("reload");
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
-
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
if not prosodyctl.isrunning() then
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
show_message("Prosody is not running");
|
|
![](https://seccdn.libravatar.org/avatar/ea064b89e87b1895a84759a4950a139e0016ae503bf0eb4304a2a809343a9d75?s=16&d=retro) |
6edd127 |
return 1;
|