diff --git a/net/prosody/Makefile b/net/prosody/Makefile index 6d411dc44..7bac97154 100644 --- a/net/prosody/Makefile +++ b/net/prosody/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=prosody -PKG_VERSION:=0.11.5 +PKG_VERSION:=0.11.7 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://prosody.im/downloads/source -PKG_HASH:=55f8bd65d5d2af61cc739bd6164e4207011e0d2d260cde583071c90d8d85408b +PKG_HASH:=28ffc07653485cb63e22b387d3ea4825ee2baaee0c5827de4d6053a35b1c8747 PKG_MAINTAINER:=Thomas Heil PKG_LICENSE:=MIT/X11 @@ -68,8 +68,7 @@ define Package/prosody/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/prosody.init $(1)/etc/init.d/prosody $(INSTALL_DIR) $(1)/etc/prosody - #$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/prosody/prosody.cfg.lua $(1)/etc/prosody/ - $(INSTALL_CONF) ./files/prosody.cfg.lua $(1)/etc/prosody/ + $(INSTALL_DATA) ./files/prosody.cfg.lua $(1)/etc/prosody/ $(INSTALL_DIR) $(1)/etc/prosody/certs $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/prosody/certs/localhost.{crt,key} $(1)/etc/prosody/certs/ $(INSTALL_DIR) $(1)/etc/prosody/data diff --git a/net/prosody/files/prosody.init b/net/prosody/files/prosody.init old mode 100644 new mode 100755 index 9829862d2..6bf93797d --- a/net/prosody/files/prosody.init +++ b/net/prosody/files/prosody.init @@ -6,19 +6,16 @@ START=99 USE_PROCD=1 BIN=/usr/bin/prosodyctl -LOG_D=/var/log/prosody -RUN_D=/var/run/prosody -PID_F=$RUN_D/prosody.pid -RUN_USER=prosody -RUN_GROUP=prosody start_service() { [ -d /var/run/prosody ] || { - mkdir -m 0755 -p /var/run/prosody + mkdir /var/run/prosody + chmod 0755 /var/run/prosody chown prosody:prosody /var/run/prosody } [ -d /var/log/prosody ] || { - mkdir -m 0755 -p /var/log/prosody + mkdir /var/log/prosody + chmod 0755 /var/log/prosody chown prosody:prosody /var/log/prosody } @@ -27,21 +24,18 @@ start_service() { chown -R prosody:prosody /etc/prosody/data } - [ -f /sbin/paxctl ] && { - paxctl -v /usr/bin/ > /dev/null 2>&1 - [ $? -ne 0 ] && { - cp /usr/bin/lua /tmp - paxctl -c -m /tmp/lua - cp -f /tmp/lua /usr/bin/lua - } - } - procd_open_instance procd_set_param command "$BIN" start 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 +}