Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

prosody: fix shellcheck warnings

Browse source 
Remove paxctl stuff. pax is not packaged in OpenWrt.

Add reload support.

Install lua cfg file as 644. It's needed to be readable as prosody user

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2020-10-14 20:07:58 -07:00
parent 68a3a06e98
commit eb46e231cd
2 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/prosody/Makefile
View file

@ -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

26
net/prosody/files/prosody.init Normal file → Executable file
View file

@ -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
}