From b1b79653ccd31b0e01f622dbbe5b626166035971 Mon Sep 17 00:00:00 2001 From: Anton Georgiev Date: Sat, 10 Aug 2024 13:03:11 -0400 Subject: [PATCH] build: remove old custom bbb-html5 NodeJS binaries (#20897) * build: remove old custom bbb-html5 NodeJS binaries * docs: mention removal of node v14 * build: list bbb-web as dependency to bbb-config * build: undo set license * re-add bbb-html5 as dependency to bbb-config --- bigbluebutton-config/bin/bbb-conf | 10 ++++------ build/opts-global.sh | 3 +-- build/packages-template/bbb-config/opts-jammy.sh | 2 +- build/packages-template/bbb-html5/before-install.sh | 5 +++++ docs/docs/new-features.md | 8 +++++--- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf index 3a9f3b54bc..9e7771011f 100755 --- a/bigbluebutton-config/bin/bbb-conf +++ b/bigbluebutton-config/bin/bbb-conf @@ -730,10 +730,10 @@ check_configuration() { fi fi - SIP_PROTOCOL=$(cat /usr/share/bigbluebutton/nginx/sip.nginx | grep -v \# | sed -n '/proxy_pass/{s/.*proxy_pass [ ]*//;s/:.*//;p}' | head -n 1) + SIP_PROTOCOL=$(cat "$SIP_CONFIG" | grep -v \# | sed -n '/proxy_pass/{s/.*proxy_pass [ ]*//;s/:.*//;p}' | head -n 1) if [[ $SIP_PROTOCOL == "https" ]]; then if ! grep wss-binding $FREESWITCH_EXTERNAL > /dev/null; then - echo "# Warning: Websockets is using HTTPS in /usr/share/bigbluebutton/nginx/sip.nginx" + echo "# Warning: Websockets is using HTTPS in $SIP_CONFIG" echo "# but no definition for wss-binding found in " echo "#" echo "# $FREESWITCH_EXTERNAL" @@ -779,8 +779,6 @@ check_state() { print_header check_configuration - bbb-conf --status - # # Check for potential problems in the BigBlueButton configuration # @@ -1023,7 +1021,7 @@ check_state() { if [ "$SIP_NGINX_IP" != "\$freeswitch_addr" ]; then echo "# Warning: The setting of $SIP_NGINX_IP for proxy_pass in" echo "#" - echo "# /usr/share/bigbluebutton/nginx/sip.nginx" + echo "# $SIP_CONFIG" echo "#" echo "# does not match the local IP address ($IP)." echo "# (This is OK if you've manually changed the values)" @@ -1280,7 +1278,7 @@ if [ $CHECK ]; then echo echo "$SIP_CONFIG (sip.nginx)" echo " proxy_pass: $SIP_NGINX_IP" - echo " protocol: $(cat /usr/share/bigbluebutton/nginx/sip.nginx | grep -v \# | sed -n '/proxy_pass/{s/.*proxy_pass [ ]*//;s/:.*//;p}' | head -n 1)" + echo " protocol: $(cat "$SIP_CONFIG" | grep -v \# | sed -n '/proxy_pass/{s/.*proxy_pass [ ]*//;s/:.*//;p}' | head -n 1)" fi if [ -n "$WEBRTC_SFU_CONFIG" ]; then diff --git a/build/opts-global.sh b/build/opts-global.sh index ae40fff039..98d62794da 100644 --- a/build/opts-global.sh +++ b/build/opts-global.sh @@ -1,2 +1 @@ -OPTS="--vendor BigBlueButon -m ffdixon@bigbluebutton.org --url http://bigbluebutton.org/" - +OPTS="--vendor BigBlueButon -m ffdixon@bigbluebutton.org --url https://bigbluebutton.org/" diff --git a/build/packages-template/bbb-config/opts-jammy.sh b/build/packages-template/bbb-config/opts-jammy.sh index 225459ba8c..c3bc5be869 100644 --- a/build/packages-template/bbb-config/opts-jammy.sh +++ b/build/packages-template/bbb-config/opts-jammy.sh @@ -1,4 +1,4 @@ . ./opts-global.sh AKKA_APPS="bbb-fsesl-akka,bbb-apps-akka" -OPTS="$OPTS -t deb -d netcat-openbsd,stun-client,bbb-playback-presentation,bbb-playback,bbb-freeswitch-core,$AKKA_APPS,yq" +OPTS="$OPTS -t deb -d netcat-openbsd,stun-client,bbb-playback-presentation,bbb-html5,bbb-playback,bbb-freeswitch-core,$AKKA_APPS,bbb-web,yq" diff --git a/build/packages-template/bbb-html5/before-install.sh b/build/packages-template/bbb-html5/before-install.sh index 7b4ab1198b..c4d1a173da 100644 --- a/build/packages-template/bbb-html5/before-install.sh +++ b/build/packages-template/bbb-html5/before-install.sh @@ -24,5 +24,10 @@ case "$1" in echo "BigBlueButton 3.0+ does not support configurations in /etc/bigbluebutton/bbb-html5-with-roles.conf" fi + # remove old nodejs, used up to BBB 3.0.0-beta.1 + if [ -d /usr/lib/bbb-html5/node ]; then + rm -r /usr/lib/bbb-html5/node + fi + ;; esac diff --git a/docs/docs/new-features.md b/docs/docs/new-features.md index d2ee0d6467..ea99510d31 100644 --- a/docs/docs/new-features.md +++ b/docs/docs/new-features.md @@ -86,7 +86,10 @@ Administrators will appreciate that we now allow passing of custom client settin For years we have discussed internally the topic of replacing Meteor.js with other technologies in order to improve scalability, performance, etc. In the last year we have introduced several different new components to replace Meteor. These new components are: `bbb-graphql-server`, `bbb-graphql-middleware`, `bbb-graphql-actions`, database Postgres, GraphQL server Hasura. As of BigBlueButton 3.0.0-beta.1 we are no longer using Meteor or MongoDB. -Note: The services `bbb-html5-backend`, `bbb-html5-frontend`, `bbb-html5` and `mongod` have been removed. The client code is compacted and served by NginX. +Note: The services `bbb-html5-backend`, `bbb-html5-frontend`, `bbb-html5` and `mongod` have been removed. The client code is compacted and served by NginX. The service `disable-transparent-huge-pages.service` was also removed as it was used to improve performance of MongoDB and is now obsolete. +The package `bbb-html5-nodejs` is no longer needed. + +**Important**: Please make sure you're no longer carrying around NodeJS v14 which we used to deploy in `bbb-html5-nodejs`. Your directory `/usr/lib/bbb-html5/node` should not exist. #### The whiteboard was improved @@ -197,8 +200,7 @@ The build scripts for packaging 3.0 (using fpm) are located in the GitHub reposi We welcome contributors to BigBlueButton 3.0! The best ways to contribute at the current time are: - - +- Help localize BigBlueButton 3.0 on [Transifex project for BBB 3.0](https://www.transifex.com/bigbluebutton/bigbluebutton-v30-html5-client/dashboard/) - Try out [installing BigBlueButton 3.0](/administration/install) and see if you spot any issues. - Help test a [3.0 pull request](https://github.com/bigbluebutton/bigbluebutton/pulls?q=is%3Aopen+is%3Apr+milestone%3A%22Release+3.0%22) in your development environment.