Menu
▾
▴
astlinux-commits
|
From: <abe...@us...> - 2013-01-19 20:28:56
|
Revision: 5912
http://astlinux.svn.sourceforge.net/astlinux/?rev=5912&view=rev
Author: abelbeck
Date: 2013-01-19 20:28:50 +0000 (Sat, 19 Jan 2013)
Log Message:
-----------
prosody, generalize XMPP_HOSTNAME to allow a space separated list of VirtualHost's
Modified Paths:
--------------
branches/1.0/package/prosody/prosody.init
Modified: branches/1.0/package/prosody/prosody.init
===================================================================
--- branches/1.0/package/prosody/prosody.init 2013-01-19 19:09:32 UTC (rev 5911)
+++ branches/1.0/package/prosody/prosody.init 2013-01-19 20:28:50 UTC (rev 5912)
@@ -25,7 +25,7 @@
gen_xmpp_config()
{
- local m MODS ADD_MODS="" modules="" admins="" hostname cert key no_s2s log syslog error c2s_port s2s_port
+ local m vh MODS ADD_MODS="" modules="" admins="" hostname cert key no_s2s log syslog error c2s_port s2s_port
local LOG_OK SYSLOG_OK ERROR_LOG IFS c2s_idle_timeout
cert="${XMPP_CERT:-/etc/prosody/certs/server.crt}"
@@ -133,10 +133,14 @@
modules_enabled = { \"posix\", $modules }
modules_disabled = { }
-
-VirtualHost \"$hostname\"
"
+ unset IFS
+ for vh in $hostname; do
+ echo "VirtualHost \"$vh\""
+ echo ""
+ done
+
if [ -n "$XMPP_CONFERENCE" ]; then
echo "Component \"$XMPP_CONFERENCE\" \"muc\""
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-04-25 21:32:05
|
Revision: 6056
http://sourceforge.net/p/astlinux/code/6056
Author: abelbeck
Date: 2013-04-25 21:31:59 +0000 (Thu, 25 Apr 2013)
Log Message:
-----------
prosody, when Server-to-Server is disabled don't listen on port 5269 - per Matthew Wild prosody mailing list
Modified Paths:
--------------
branches/1.0/package/prosody/prosody.init
Modified: branches/1.0/package/prosody/prosody.init
===================================================================
--- branches/1.0/package/prosody/prosody.init 2013-04-25 00:15:21 UTC (rev 6055)
+++ branches/1.0/package/prosody/prosody.init 2013-04-25 21:31:59 UTC (rev 6056)
@@ -40,9 +40,11 @@
if [ "$XMPP_ENABLE_S2S" = "yes" ]; then
MODS="$DEFAULT_MODULES $DEFAULT_MODULES_S2S"
no_s2s="false"
+ s2s_port="${XMPP_S2S_PORT:-5269}"
else
MODS="$DEFAULT_MODULES"
no_s2s="true"
+ s2s_port=""
fi
if [ "$XMPP_GROUPS" = "yes" ]; then
@@ -81,8 +83,6 @@
c2s_port="${XMPP_C2S_PORT:-5222}"
- s2s_port="${XMPP_S2S_PORT:-5269}"
-
log="${XMPP_LOG:-none}"
if [ "$log" = "warn" -o "$log" = "info" -o "$log" = "debug" ]; then
LOG_OK=""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-12-05 22:24:36
|
Revision: 8019
http://sourceforge.net/p/astlinux/code/8019
Author: abelbeck
Date: 2016-12-05 22:24:33 +0000 (Mon, 05 Dec 2016)
Log Message:
-----------
prosody, init.d script, use 'start-stop-daemon' for start and stop
Modified Paths:
--------------
branches/1.0/package/prosody/prosody.init
Modified: branches/1.0/package/prosody/prosody.init
===================================================================
--- branches/1.0/package/prosody/prosody.init 2016-12-05 18:54:36 UTC (rev 8018)
+++ branches/1.0/package/prosody/prosody.init 2016-12-05 22:24:33 UTC (rev 8019)
@@ -2,6 +2,8 @@
. /etc/rc.conf
+PIDFILE="/var/run/prosody/prosody.pid"
+
DEFAULT_MODULES="roster saslauth tls disco \
private vcard \
legacyauth version uptime time ping pep register adhoc \
@@ -109,7 +111,7 @@
fi
echo "
-pidfile = \"/var/run/prosody/prosody.pid\"
+pidfile = \"${PIDFILE}\"
prosody_user = \"prosody\"
prosody_group = \"prosody\"
@@ -245,24 +247,24 @@
if [ -f /etc/prosody/prosody.cfg.lua ] && grep -q '^[^-]*"posix"' /etc/prosody/prosody.cfg.lua; then
echo "Starting XMPP Server..."
- su -p -s /bin/ash -c /usr/bin/prosody prosody
+ start-stop-daemon -S -x /usr/bin/prosody -n lua -p $PIDFILE -u prosody --chuid prosody:prosody
fi
}
stop () {
- if [ -f /var/run/prosody/prosody.pid ]; then
+ if [ -f $PIDFILE ]; then
echo "Stopping XMPP Server..."
- kill $(cat /var/run/prosody/prosody.pid) >/dev/null 2>&1
+ start-stop-daemon -K -q -n lua -p $PIDFILE -u prosody -s TERM
# Wait for prosody to stop
cnt=5
- while [ $cnt -gt 0 ] && [ -f /var/run/prosody/prosody.pid ]; do
+ while [ $cnt -gt 0 ] && [ -f $PIDFILE ]; do
cnt=$((cnt - 1))
sleep 1
done
- rm -f /var/run/prosody/prosody.pid
+ rm -f $PIDFILE
fi
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-07-12 16:54:52
|
Revision: 8436
http://sourceforge.net/p/astlinux/code/8436
Author: abelbeck
Date: 2017-07-12 16:54:49 +0000 (Wed, 12 Jul 2017)
Log Message:
-----------
prosody, init.d script tweak to allow a pre-existing /mnt/kd/prosody/certs to still create /mnt/kd/prosody/data if missing
Modified Paths:
--------------
branches/1.0/package/prosody/prosody.init
Modified: branches/1.0/package/prosody/prosody.init
===================================================================
--- branches/1.0/package/prosody/prosody.init 2017-07-12 14:42:51 UTC (rev 8435)
+++ branches/1.0/package/prosody/prosody.init 2017-07-12 16:54:49 UTC (rev 8436)
@@ -196,10 +196,9 @@
exit
fi
- if [ ! -d /mnt/kd/prosody ]; then
- mkdir /mnt/kd/prosody
- mkdir /mnt/kd/prosody/data
- mkdir /mnt/kd/prosody/certs
+ if [ ! -d /mnt/kd/prosody/data ]; then
+ mkdir -p /mnt/kd/prosody/data
+ mkdir -p /mnt/kd/prosody/certs
find /mnt/kd/prosody -print0 | xargs -0 chown prosody:prosody
chmod 750 /mnt/kd/prosody/data
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X