Added fix for JITSI_SCALE in start
This commit is contained in:
parent
2c81a8f4bd
commit
74595fca75
29
bin/start
29
bin/start
@ -10,12 +10,18 @@ usage() {
|
||||
exit 2
|
||||
}
|
||||
startservice_jitsi() {
|
||||
if [ "$JITSI_SCALE" = "server" ]; then
|
||||
JITSI_IP="192.168.0.28 8080"
|
||||
else
|
||||
JITSI_IP="192.168.0.25 443"
|
||||
fi
|
||||
|
||||
if [ -z "$ALERTS_EMAIL" ]; then
|
||||
spin &
|
||||
SPINPID=$!
|
||||
|
||||
NC_COMMAND=`grep start_service /federated/lib/$SERVICE.sh | awk -F\" '{ print $4 }'`
|
||||
RETRY=`grep start_service /federated/lib/jitsi.sh | awk -F\" '{ print $6 }'`
|
||||
NC_COMMAND=`grep "$JITSI_IP" /federated/lib/$SERVICE.sh | awk -F\" '{ print $4 }'`
|
||||
RETRY=`grep "$JITSI_IP" /federated/lib/jitsi.sh | awk -F\" '{ print $6 }'`
|
||||
start_service_withalert "jitsi" "$NC_COMMAND" "$RETRY" "no"
|
||||
|
||||
disown $SPINPID &> /dev/null
|
||||
@ -25,8 +31,8 @@ startservice_jitsi() {
|
||||
spin &
|
||||
SPINPID=$!
|
||||
|
||||
NC_COMMAND=`grep start_service /federated/lib/$SERVICE.sh | awk -F\" '{ print $4 }'`
|
||||
RETRY=`grep start_service /federated/lib/jitsi.sh | awk -F\" '{ print $6 }'`
|
||||
NC_COMMAND=`grep "$JITSI_IP" /federated/lib/$SERVICE.sh | awk -F\" '{ print $4 }'`
|
||||
RETRY=`grep "$JITSI_IP" /federated/lib/jitsi.sh | awk -F\" '{ print $6 }'`
|
||||
start_service_withalert "$SERVICE" "$NC_COMMAND" "$RETRY" "yes"
|
||||
|
||||
disown $SPINPID &> /dev/null
|
||||
@ -111,9 +117,24 @@ startservice_coreapp() {
|
||||
}
|
||||
startservice_all_new() {
|
||||
echo "* Starting $1."
|
||||
|
||||
if [ "$i" = "jitsi" ]; then
|
||||
if [ "$JITSI_SCALE" = "server" ]; then
|
||||
JITSI_IP="192.168.0.28 8080"
|
||||
NC_COMMAND=`grep "$JITSI_IP" /federated/lib/$1.sh | awk -F\" '{ print $4 }'`
|
||||
RETRY=`grep "$JITSI_IP" /federated/lib/$1.sh | awk -F\" '{ print $6 }'`
|
||||
eval start_service_withalert2 "$1" "$NC_COMMAND" "$RETRY" "no"
|
||||
else
|
||||
JITSI_IP="192.168.0.25 443"
|
||||
NC_COMMAND=`grep "$JITSI_IP" /federated/lib/$1.sh | awk -F\" '{ print $4 }'`
|
||||
RETRY=`grep "$JITSI_IP" /federated/lib/$1.sh | awk -F\" '{ print $6 }'`
|
||||
eval start_service_withalert2 "$1" "$NC_COMMAND" "$RETRY" "no"
|
||||
fi
|
||||
else
|
||||
NC_COMMAND=`grep start_service /federated/lib/$1.sh | awk -F\" '{ print $4 }'`
|
||||
RETRY=`grep start_service /federated/lib/$1.sh | awk -F\" '{ print $6 }'`
|
||||
eval start_service_withalert2 "$1" "$NC_COMMAND" "$RETRY" "no"
|
||||
fi
|
||||
}
|
||||
|
||||
[ $# != 1 ] && usage
|
||||
|
Loading…
x
Reference in New Issue
Block a user