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

Merge pull request #14482 from antobinary/packaging-cleanup-6

Browse Source 
refactor(bbb-config): drop usage of obsolete settings-production.json
This commit is contained in:
Anton Georgiev 2022-02-28 12:19:49 -05:00 committed by GitHub
commit 87e47d220b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,7 +153,6 @@ get_bbb_web_config_value() {
RECORD_CONFIG=/usr/local/bigbluebutton/core/scripts/bigbluebutton.yml RECORD_CONFIG=/usr/local/bigbluebutton/core/scripts/bigbluebutton.yml
HTML5_CONFIG_OLD=/usr/share/meteor/bundle/programs/server/assets/app/config/settings-production.json
HTML5_DEFAULT_CONFIG=/usr/share/meteor/bundle/programs/server/assets/app/config/settings.yml HTML5_DEFAULT_CONFIG=/usr/share/meteor/bundle/programs/server/assets/app/config/settings.yml
HTML5_ETC_CONFIG=/etc/bigbluebutton/bbb-html5.yml HTML5_ETC_CONFIG=/etc/bigbluebutton/bbb-html5.yml
if [ -f $HTML5_ETC_CONFIG ]; then if [ -f $HTML5_ETC_CONFIG ]; then
@ -812,20 +811,6 @@ check_configuration() {
echo "# $FREESWITCH_EXTERNAL" echo "# $FREESWITCH_EXTERNAL"
echo echo
fi fi
if [ -f $HTML5_CONFIG_OLD ]; then
if grep \"enableListenOnly\".*true $HTML5_CONFIG_OLD > /dev/null; then
if ! grep -q ws-binding $FREESWITCH_EXTERNAL ; then
echo "# Warning: You have enabled listen-only audio via Kurento"
echo "# but FreeSWITCH is not listening on port 5066. You should edit "
echo "#"
echo "# $FREESWITCH_EXTERNAL"
echo "#"
echo "# and add a line that enables ws-binding on port 5066."
echo
fi
fi
fi
fi fi
if [ "$(ls -ld /var/freeswitch/meetings | cut -d' ' -f3)" != "freeswitch" ]; then if [ "$(ls -ld /var/freeswitch/meetings | cut -d' ' -f3)" != "freeswitch" ]; then
@ -1735,11 +1720,6 @@ if [ -n "$HOST" ]; then
# #
# Update HTML5 client # Update HTML5 client
# #
if [ -f $HTML5_CONFIG_OLD ]; then
WS=$(cat $SERVLET_DIR/WEB-INF/classes/bigbluebutton.properties | grep -v '#' | sed -n '/^bigbluebutton.web.serverURL/{s/.*=//;p}' | sed 's/https/wss/g' | sed s'/http/ws/g')
sed -i "s|\"wsUrl.*|\"wsUrl\": \"$WS/bbb-webrtc-sfu\",|g" $HTML5_CONFIG_OLD
fi
if [ -f $HTML5_DEFAULT_CONFIG ]; then if [ -f $HTML5_DEFAULT_CONFIG ]; then
yq w -i $HTML5_DEFAULT_CONFIG public.kurento.wsUrl "wss://$HOST/bbb-webrtc-sfu" yq w -i $HTML5_DEFAULT_CONFIG public.kurento.wsUrl "wss://$HOST/bbb-webrtc-sfu"
yq w -i $HTML5_DEFAULT_CONFIG public.pads.url "$PROTOCOL://$HOST/pad" yq w -i $HTML5_DEFAULT_CONFIG public.pads.url "$PROTOCOL://$HOST/pad"

3
bigbluebutton-html5/deploy_to_usr_share.sh
View File

@ -61,9 +61,6 @@ sudo cp $LOCAL_PACKAGING_DIR/bionic/systemd_start.sh "$DESTINATION_DIR"/systemd_
echo "writing $DESTINATION_DIR/systemd_start_frontend.sh" echo "writing $DESTINATION_DIR/systemd_start_frontend.sh"
sudo cp $LOCAL_PACKAGING_DIR/bionic/systemd_start_frontend.sh "$DESTINATION_DIR"/systemd_start_frontend.sh sudo cp $LOCAL_PACKAGING_DIR/bionic/systemd_start_frontend.sh "$DESTINATION_DIR"/systemd_start_frontend.sh
echo "writing $DESTINATION_DIR/workers-start.sh"
sudo cp $LOCAL_PACKAGING_DIR/bionic/workers-start.sh "$DESTINATION_DIR"/workers-start.sh
sudo chown -R meteor:meteor "$UPPER_DESTINATION_DIR"/ sudo chown -R meteor:meteor "$UPPER_DESTINATION_DIR"/
sudo chmod +x "$DESTINATION_DIR"/mongod_start_pre.sh sudo chmod +x "$DESTINATION_DIR"/mongod_start_pre.sh
sudo chmod +x "$DESTINATION_DIR"/systemd_start.sh sudo chmod +x "$DESTINATION_DIR"/systemd_start.sh

2
bigbluebutton-html5/docker-entrypoint.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash -e #!/bin/bash -e
export METEOR_SETTINGS=` jq "${METEOR_SETTINGS_MODIFIER}" ./programs/server/assets/app/config/settings-production.json ` export METEOR_SETTINGS=` jq "${METEOR_SETTINGS_MODIFIER}" ./programs/server/assets/app/config/settings.yml `
exec node main.js exec node main.js