prosody: do not drive the service through prosodyctl

prosodyctl refuses start, stop, restart and reload once it detects an
init system, and /etc/init.d/prosody makes that detection always true.
The refusal is fatal, so the service could neither be started nor
stopped:

  ERROR: Use of 'prosodyctl stop' is disabled in this installation
         because we detected that this system uses rc.d for managing
         services.

Let procd supervise the daemon directly with -F instead, and reload the
configuration with SIGHUP, which is what prosody expects.

Signed-off-by: Josef Schlehofer <redacted>

diff --git a/net/prosody/Makefile b/net/prosody/Makefile
index f4b3e650256fd482fe4ec24902b341b423d7332c..fc747144dd89d5cbcaf9400a864e8f518bd8a65f 100644 (file)
--- a/net/prosody/Makefile
+++ b/net/prosody/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=prosody
 PKG_VERSION:=13.0.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://prosody.im/downloads/source

diff --git a/net/prosody/files/prosody.init b/net/prosody/files/prosody.init
index 6bf93797d20138daf88b31db7a5eb404c8ef8dc4..2adc6ed665eac36a67345b43043eae2774ef1fae 100755 (executable)
--- a/net/prosody/files/prosody.init
+++ b/net/prosody/files/prosody.init
@@ -5,7 +5,7 @@ START=99
 
 USE_PROCD=1
 
-BIN=/usr/bin/prosodyctl
+BIN=/usr/bin/prosody
 
 start_service() {
        [ -d /var/run/prosody ] || {
@@ -25,17 +25,13 @@ start_service() {
        }
 
        procd_open_instance
-       procd_set_param command "$BIN" start
+       procd_set_param command "$BIN" -F
        procd_set_param file /etc/prosody/prosody.cfg.lua
        procd_set_param user prosody
        procd_set_param group prosody
        procd_close_instance
 }
 
-stop_service() {
-       ${BIN} stop
-}
-
 reload_service() {
-       ${BIN} reload
+       procd_send_signal prosody
 }