Merge pull request #803 from bigbluebutton/oct16-merge

antobinary · web-flow · commit 1fe98407571c · 2025-10-16T18:30:51.000-04:00
chore: Carry forward BBB 3.0 fixes to 3.1
diff --git a/bbb-install.sh b/bbb-install.sh
@@ -18,7 +18,7 @@
 #    https://www.bigbluebutton.org/.
 #
 # This bbb-install script automates many of the installation and configuration
-# steps at https://docs.bigbluebutton.org/3.1/install
+# steps at https://docs.bigbluebutton.org/administration/install
 #
 #
 #  Examples
@@ -287,8 +287,8 @@ main() {
 
     #need_ppa libreoffice-ubuntu-ppa-jammy.list       ppa:libreoffice/ppa        1378B444 # Latest version of libreoffice
 
-    need_ppa bigbluebutton-ubuntu-support-focal.list ppa:bigbluebutton/support  2E1B01D0E95B94BC    # Needed for libopusenc0
-    need_ppa martin-uni-mainz-ubuntu-coturn-focal.list ppa:martin-uni-mainz/coturn  4B77C2225D3BBDB3 # Coturn
+    need_ppa bigbluebutton-ubuntu-support-jammy.list ppa:bigbluebutton/support  2E1B01D0E95B94BC    # Needed for libopusenc0
+    need_ppa martin-uni-mainz-ubuntu-coturn-jammy.list ppa:martin-uni-mainz/coturn  4B77C2225D3BBDB3 # Coturn
 
     if [ -f /etc/apt/sources.list.d/nodesource.list ] &&  grep -q 18 /etc/apt/sources.list.d/nodesource.list; then
       # Node 18 might be installed, previously used in BigBlueButton

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`# https://www.bigbluebutton.org/.`
`19`	`19`	`#`
`20`	`20`	`# This bbb-install script automates many of the installation and configuration`
`21`		`-# steps at https://docs.bigbluebutton.org/3.1/install`
	`21`	`+# steps at https://docs.bigbluebutton.org/administration/install`
`22`	`22`	`#`
`23`	`23`	`#`
`24`	`24`	`# Examples`
`@@ -287,8 +287,8 @@ main() {`
`287`	`287`
`288`	`288`	`#need_ppa libreoffice-ubuntu-ppa-jammy.list ppa:libreoffice/ppa 1378B444 # Latest version of libreoffice`
`289`	`289`
`290`		`- need_ppa bigbluebutton-ubuntu-support-focal.list ppa:bigbluebutton/support 2E1B01D0E95B94BC # Needed for libopusenc0`
`291`		`- need_ppa martin-uni-mainz-ubuntu-coturn-focal.list ppa:martin-uni-mainz/coturn 4B77C2225D3BBDB3 # Coturn`
	`290`	`+ need_ppa bigbluebutton-ubuntu-support-jammy.list ppa:bigbluebutton/support 2E1B01D0E95B94BC # Needed for libopusenc0`
	`291`	`+ need_ppa martin-uni-mainz-ubuntu-coturn-jammy.list ppa:martin-uni-mainz/coturn 4B77C2225D3BBDB3 # Coturn`
`292`	`292`
`293`	`293`	`if [ -f /etc/apt/sources.list.d/nodesource.list ] && grep -q 18 /etc/apt/sources.list.d/nodesource.list; then`
`294`	`294`	`# Node 18 might be installed, previously used in BigBlueButton`