Merge pull request #15274 from antobinary/cherry-pick-15265
fix(bbb-conf): Change in bbb-conf to not rely on tomcat (port of #15265)
This commit is contained in:
commit
1f6a15042f
@ -421,7 +421,15 @@ start_bigbluebutton () {
|
||||
TOMCAT_SERVICE=$TOMCAT_USER
|
||||
fi
|
||||
|
||||
systemctl start $TOMCAT_SERVICE nginx freeswitch $REDIS_SERVICE bbb-apps-akka bbb-fsesl-akka bbb-rap-resque-worker bbb-rap-starter.service bbb-rap-caption-inbox.service $HTML5 $WEBHOOKS $ETHERPAD $PADS $BBB_WEB $BBB_LTI
|
||||
systemctl start $TOMCAT_SERVICE || {
|
||||
echo
|
||||
echo "# Warning: $TOMCAT_SERVICE could not be started. Please, check BBB-LTI or BBB-Demo."
|
||||
echo "# Run the command:"
|
||||
echo "# sudo journalctl -u $TOMCAT_SERVICE"
|
||||
echo "# To better understand the ERROR"
|
||||
}
|
||||
|
||||
systemctl start nginx freeswitch $REDIS_SERVICE bbb-apps-akka bbb-fsesl-akka bbb-rap-resque-worker bbb-rap-starter.service bbb-rap-caption-inbox.service $HTML5 $WEBHOOKS $ETHERPAD $PADS $BBB_WEB $BBB_LTI
|
||||
|
||||
if [ -f /usr/lib/systemd/system/bbb-html5.service ]; then
|
||||
systemctl start mongod
|
||||
@ -1134,10 +1142,19 @@ check_state() {
|
||||
fi
|
||||
|
||||
if bbb-conf --status | grep -q inactive; then
|
||||
echo "# Error: Detected some processes have not started correctly"
|
||||
echo "#"
|
||||
echo "# $(bbb-conf --status | grep inactive)"
|
||||
echo "#"
|
||||
|
||||
if bbb-conf --status | grep -q tomcat9; then
|
||||
echo "# Warning: $TOMCAT_SERVICE is not started correctly"
|
||||
echo "#"
|
||||
echo "# $(bbb-conf --status | grep inactive | grep $TOMCAT_SERVICE)"
|
||||
echo "#"
|
||||
fi
|
||||
if bbb-conf --status | grep inactive | grep -vq tomcat9; then
|
||||
echo "# Error: Detected some processes have not started correctly"
|
||||
echo "#"
|
||||
echo "# $(bbb-conf --status | grep inactive | grep -v $TOMCAT_SERVICE)"
|
||||
echo "#"
|
||||
fi
|
||||
fi
|
||||
|
||||
if systemctl status freeswitch | grep -q SETSCHEDULER; then
|
||||
|
Loading…
Reference in New Issue
Block a user