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

Correctly stop libreoffice when doing sudo bbb-conf --clean

Browse Source
This commit is contained in:
Fred Dixon 2014-08-20 07:08:39 -04:00
parent 31b04303f9
commit f704a2f3e6
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,8 +235,8 @@ stop_bigbluebutton () {
$FREESWITCH_INIT_D stop $FREESWITCH_INIT_D stop
fi fi
if [ -f /etc/init.d/bbb-openoffice-headless ]; then if [ -f /etc/init.d/bbb-office ]; then
/etc/init.d/bbb-openoffice-headless stop /etc/init.d/bbb-office stop
fi fi
if [ -f /etc/init.d/bbb-record-core ]; then if [ -f /etc/init.d/bbb-record-core ]; then
@ -246,7 +246,6 @@ stop_bigbluebutton () {
} }
start_bigbluebutton () { start_bigbluebutton () {
$FREESWITCH_INIT_D start $FREESWITCH_INIT_D start
FREESWITCH_ESL_IP=$(sudo cat /opt/freeswitch/conf/autoload_configs/event_socket.conf.xml | grep 'name="listen-ip"' | cut -d\" -f4 | awk '{print $1}') FREESWITCH_ESL_IP=$(sudo cat /opt/freeswitch/conf/autoload_configs/event_socket.conf.xml | grep 'name="listen-ip"' | cut -d\" -f4 | awk '{print $1}')
@ -266,9 +265,9 @@ start_bigbluebutton () {
/etc/init.d/bbb-red5 start /etc/init.d/bbb-red5 start
/etc/init.d/${SERVLET_CONTAINER} start /etc/init.d/${SERVLET_CONTAINER} start
# monit will start libreoffice and bbb-rap-worker
/etc/init.d/monit start /etc/init.d/monit start
# #
# At this point the red5 and servlet container applications are starting up. # At this point the red5 and servlet container applications are starting up.
# #
@ -912,7 +911,7 @@ check_state() {
# #
FFMPEG_VERSION=$(ffmpeg -version 2>/dev/null | grep ffmpeg | cut -d ' ' -f3) FFMPEG_VERSION=$(ffmpeg -version 2>/dev/null | grep ffmpeg | cut -d ' ' -f3)
case "$FFMPEG_VERSION" in case "$FFMPEG_VERSION" in
2.0|2.0.*) 2.3.*)
# This is the current supported version; OK. # This is the current supported version; OK.
;; ;;
'') '')