Merge branch 'bbb-conf-tomcat-systemctl' of github.com:BrentBaccala/b…

…igbluebutton into tomcat
EXTREMOPHILARUM · Aug 26, 2022 · 3c31006 · 3c31006
2 parents 07bdc6b + 21b08db
commit 3c31006
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf
@@ -346,9 +346,8 @@ stop_bigbluebutton () {
 
     if systemctl list-units --full -all | grep -q $TOMCAT_USER.service; then
       TOMCAT_SERVICE=$TOMCAT_USER
+      systemctl stop $TOMCAT_SERVICE bigbluebutton.target
     fi
-
-    systemctl stop $TOMCAT_SERVICE bigbluebutton.target
 }
 
 start_bigbluebutton () {
@@ -377,15 +376,15 @@ start_bigbluebutton () {
 
     if systemctl list-units --full -all | grep -q $TOMCAT_USER.service; then
         TOMCAT_SERVICE=$TOMCAT_USER
-    fi
 
-    systemctl start $TOMCAT_SERVICE || {
-        echo
-        echo "# Warning: $TOMCAT_SERVICE could not be started. Please, check BBB-LTI."
-        echo "#     Run the command:"
-        echo "#       sudo journalctl -u $TOMCAT_SERVICE"
-        echo "#     To better understand the ERROR"
-    }
+        [ -z "$TOMCAT_SERVICE" ] || systemctl start $TOMCAT_SERVICE || {
+            echo
+            echo "# Warning: $TOMCAT_SERVICE could not be started. Please, check BBB-LTI."
+            echo "#     Run the command:"
+            echo "#       sudo journalctl -u $TOMCAT_SERVICE"
+            echo "#     To better understand the ERROR"
+        }
+    fi
 
     systemctl start bigbluebutton.target 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