BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15274 from antobinary/cherry-pick-15265

Browse Source 
fix(bbb-conf): Change in bbb-conf to not rely on tomcat (port of #15265)
This commit is contained in:
Anton Georgiev 2022-06-28 12:55:07 -04:00 committed by GitHub
commit 1f6a15042f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bigbluebutton-config/bin/bbb-conf
View File

@ -421,7 +421,15 @@ start_bigbluebutton () {
TOMCAT_SERVICE=$TOMCAT_USER TOMCAT_SERVICE=$TOMCAT_USER
fi 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 if [ -f /usr/lib/systemd/system/bbb-html5.service ]; then
systemctl start mongod systemctl start mongod
@ -1134,10 +1142,19 @@ check_state() {
fi fi
if bbb-conf --status | grep -q inactive; then if bbb-conf --status | grep -q inactive; then
echo "# Error: Detected some processes have not started correctly"
echo "#" if bbb-conf --status | grep -q tomcat9; then
echo "# $(bbb-conf --status | grep inactive)" echo "# Warning: $TOMCAT_SERVICE is not started correctly"
echo "#" 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 fi
if systemctl status freeswitch | grep -q SETSCHEDULER; then if systemctl status freeswitch | grep -q SETSCHEDULER; then