Software / code / prosody
Comparison
prosodyctl @ 11812:42e98179c034
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 20 Sep 2021 15:51:43 +0200 |
| parent | 11693:7c03b1f4c388 |
| parent | 11809:49cfd3628d9d |
| child | 11884:248477e45c64 |
comparison
equal
deleted
inserted
replaced
| 11808:c24580a214f3 | 11812:42e98179c034 |
|---|---|
| 228 | 228 |
| 229 local function service_command_warning(service_command) | 229 local function service_command_warning(service_command) |
| 230 if prosody.installed and configmanager.get("*", "prosodyctl_service_warnings") ~= false then | 230 if prosody.installed and configmanager.get("*", "prosodyctl_service_warnings") ~= false then |
| 231 show_warning("WARNING: Use of prosodyctl start/stop/restart/reload is not recommended"); | 231 show_warning("WARNING: Use of prosodyctl start/stop/restart/reload is not recommended"); |
| 232 show_warning(" if Prosody is managed by an init system - use that directly instead."); | 232 show_warning(" if Prosody is managed by an init system - use that directly instead."); |
| 233 lfs = lfs or require | 233 lfs = lfs or require"lfs"; |
| 234 if lfs.attributes("/etc/systemd") then | 234 if lfs.attributes("/etc/systemd") then |
| 235 show_warning(" e.g. systemctl %s prosody", service_command); | 235 show_warning(" e.g. systemctl %s prosody", service_command); |
| 236 elseif lfs.attributes("/etc/init.d/prosody") then | 236 elseif lfs.attributes("/etc/init.d/prosody") then |
| 237 show_warning(" e.g. /etc/init.d/prosody %s", service_command); | 237 show_warning(" e.g. /etc/init.d/prosody %s", service_command); |
| 238 end | 238 end |