Commit Graph

496 Commits

Author SHA1 Message Date
Anton Georgiev
8237862117 build: resolve conflicts opts dependencies 2022-01-27 19:18:59 +00:00
Anton Georgiev
46cb753c44 Merge branch 'dev-24-0125' of github.com:ramonlsouza/bigbluebutton into merge-jan-27 2022-01-27 16:03:12 +00:00
Pedro Beschorner Marin
0e01274eaf fix(build): missing bbb-pads
Add bbb-pads at bigbluebutton's build packages list
2022-01-26 15:14:27 -03:00
Ramón Souza
16cd3c4ebb Merge remote-tracking branch 'upstream/v2.4.x-release' into dev-24-0125 2022-01-25 16:56:52 +00:00
Pedro Beschorner Marin
becce20fa5 fix(pads): add double quotes to APIKEY
JSON file format requires double quoted string data. Add quotes when configuring
ETHERPAD_API_KEY at bbb-pads build scripts.
2022-01-25 08:47:24 -03:00
moonlies
f057671122 fix missing directory error for etherpad installation 2022-01-22 23:35:07 +01:00
Pedro Beschorner Marin
810deb907b refactor(etherpad): access control et al.
Move all Etherpad's access control from Meteor to a separated [Node application](https://github.com/bigbluebutton/bbb-pads).
This new app uses [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview)
to create groups and manage session tokens for users to access them. Each group
represents one distinct pad at the html5 client.

- Removed locked users' access to pads: replaced readOnly pad's access with a new pad's content sharing routine
- Pad's access is now controlled by [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview)
- Closed captions edited content now reflects at it's live feedback
- Improved closed caption's dictation mode live feedback
- Moved all Etherpad's API control from Meteor to a separated [app](https://github.com/bigbluebutton/bbb-pads)
- Included access control both in akka-apps and bbb-pads
2022-01-21 16:56:01 -03:00
Fred Dixon
8ccd896e92
Merge pull request #14110 from schrd/filepermissions
Fix: ensure services can't modify their code
2022-01-16 23:15:24 -04:00
Daniel Schreiber
5cce940346 Fix: ensure services can't modify their code
Code should be owned by root, so an attacker cannot modify it. The same
should apply to systemd unit files.

closes #11752
closes #10831
2022-01-16 18:10:09 +01:00
Anton Georgiev
10aaf8071f build: Added auto restart of bbb-html5-backend and frontend on failure 2022-01-13 21:13:19 +00:00
Ramón Souza
f6e65f58c5 merge 2.4 into develop and resolve conflicts - partial 2022-01-12 16:40:45 +00:00
Anton Georgiev
62040bdcb3 build: use official ep_cursortrace 2021-12-20 14:35:43 +00:00
Pedro Beschorner Marin
d592c11062 build(etherpad): bump v1.8.16 2021-12-16 15:04:26 -03:00
Anton Georgiev
797fc49633 TEMP 2021-12-09 20:37:05 +00:00
Anton Georgiev
aa03a8093b
Merge pull request #13827 from prlanzarin/u24-desolation-seed
chore: add user infos in custom HTTP headers to checkAuthorization's OK, forward them to SFU
2021-12-06 12:34:40 -05:00
prlanzarin
896f629a94 chore: pipe user info from bbb-web checkAuth to webrtc-sfu 2021-12-03 19:49:27 +00:00
Anton Georgiev
578332a094
Merge pull request #13731 from schrd/cluster_proxy
Allow BBB to run behind a proxy the avoid gUM permission queries per node
2021-12-03 11:32:07 -05:00
Anton Georgiev
229580db40 build: disable JS execution in mongodb 2021-12-02 22:13:36 +00:00
Tainan Felipe
12117164d6 disable JS execution in mongodb 2021-12-02 09:51:21 -03:00
Anton Georgiev
20a953373f
build: Update the Maintainer field for bigblutbutton 2021-11-22 15:15:30 -05:00
Daniel Schreiber
c97c033cfd Update packaging and nginx config for loadbalancer
To ease setup some changes required in the nginx config for load
balancer setup are prepared here. They do not harm non-loadbalancer setups.

The changes in the system startup scripts are mandatory
2021-11-21 21:12:50 +01:00
Daniel Schreiber
b30b3accf3 build: fix bbb-webrtc-sfu cronjob
the cronjob queries the number of users. The query was still from BBB 2.2
and returned always 0. Now we take every user into account.
2021-11-10 22:22:10 +01:00
Anton Georgiev
2e01272acc build: html5 nodejs version + cleanup 2021-11-03 16:19:32 +00:00
Anton Georgiev
c8a85825cf
build: Set bbb-html5 Nodejs version to 14.18.1
Missed during #13610
2021-11-03 11:57:58 -04:00
Anton Georgiev
a7c98311fd Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24 2021-11-03 14:04:32 +00:00
Anton Georgiev
0578037e14 build: Update bbb-html5 build scripts for Meteor 2.5.0 2021-11-01 19:21:41 +00:00
Anton Georgiev
d62a9a1fa9
Merge pull request #13594 from BrentBaccala/improve-freeswitch-build
Improve freeswitch build
2021-10-29 18:44:37 -04:00
Anton Georgiev
bd002b3b3f build: bbb-html5 npm deps improvements 2021-10-29 19:30:59 +00:00
Anton Georgiev
022f125e15 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-dev 2021-10-29 13:24:51 +00:00
Brent Baccala
4cdd6397ba further cleaning of freeswitch build script - introduce use of BUILDDIR 2021-10-27 22:29:58 -04:00
Brent Baccala
5d30fc149f copy bbb-voice-conference into freeswitch build tree when we build,
not when we clone the freeswitch repository, so that changes to
bbb-voice-conference get reflected in the build
2021-10-27 22:29:43 -04:00
Brent Baccala
465e102015 clean up bbb-freeswitch-core package template by removing unused files 2021-10-27 22:29:24 -04:00
Bohdan Zhemelinskyi
6f8c4bce75 added autorestart 2021-10-27 20:52:12 +00:00
Bohdan Zhemelinskyi
db9931c93a Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into serviceRestart 2021-10-27 19:42:33 +00:00
Anton Georgiev
d7567b35f3
Merge pull request #13568 from antobinary/build-mongo-conf
chore: Set FreeSWITCH to build from branch v1.10.7
2021-10-26 17:19:01 -04:00
Anton Georgiev
b0e1d019b4 pin versions of FreeSWITCH and related libs 2021-10-26 21:14:21 +00:00
Michael F. Schönitzer
b56facaba7 Set worker_rlimit_nofile only once in nginx.conf
worker_rlimit_nofile may only be set once in nginx.conf. So far there was no check whether it is already set to a value different than 10000. This results in the option beeing set twice in the config file, if it was already set by. This caused nginx to fail startup. Now it is checked that the limit is at least 10000 and only if not it is set to 10000.
2021-10-26 19:46:19 +00:00
Anton Georgiev
7365b951b9
Merge pull request #13248 from Nudin/patch-2
Set worker_rlimit_nofile only once in nginx.conf
2021-10-26 14:26:23 -04:00
Bohdan Zhemelinskyi
cccf8db790 Implemented the fix regarding mongod error messages 2021-10-26 14:46:33 +00:00
Paulo Lanzarin
bb4b7c52c1
Merge pull request #13553 from prlanzarin/u24-himera-pi
refactor(build): bump SFU to 2.6.0-beta.7, remove mediasoup cleanup code
2021-10-25 20:54:37 -03:00
Anton Georgiev
8a2b108b11 build: MongoDB conf changes from 2.3 to 2.4 2021-10-25 20:11:24 +00:00
Anton Georgiev
2cb583b19f build: Build libks before FreeSWITCH 2021-10-25 18:35:11 +00:00
Paulo Lanzarin
245311947d
Update build/packages-template/bbb-webrtc-sfu/build.sh
Co-authored-by: schrd <schrd@users.noreply.github.com>
2021-10-25 14:00:24 -03:00
prlanzarin
56888e999e refactor(build): bump SFU to 2.6.0-beta.7, remove mediasoup cleanup code
beta.6 updates mediasoup 3.9.0 which has a new Meson build system

That new build system does a pretty good job cleaning compiler leftovers on its
own, so theoretically our cleanup code isn't needed anymore.

Amend history:
  build/packages-template/bbb-webrtc-sfu/build.sh -> v2.6.0-beta.6 to beta.7
2021-10-24 22:58:32 +00:00
Bohdan Zhemelinskyi
1b92e143f5 Update to functionality 2021-10-20 17:30:18 +00:00
Bohdan Zhemelinskyi
8fec84afa8 Added automatic restart on failure 2021-10-20 14:08:43 +00:00
Anton Georgiev
55416fb628 remove unneeded pip3 code 2021-10-19 21:07:05 +00:00
Anton Georgiev
eeed40f52a build: bbb-freeswitch-core install pip3 to solve site-packages missing 2021-10-19 21:07:05 +00:00
zfgrnzfsberire
37c31ce81b use placeholder files during change detection
also fix comment at top of script to reflect the current development state
2021-10-19 21:06:09 +00:00
Anton Georgiev
62c67a2f67 build: Rely on meteor version from docker image 2021-10-19 21:03:52 +00:00
Anton Georgiev
bf88e3d577 build: Specify meteor version before building
This resolves an issue where we were building the npm dependencies against Meteor matching Node 12 but were trying to install locally for Node 14.

An additional change to consider could be to include the correct Meteor version in the Dockerfile for BBB but that may mean different images per BBB version.

I also leave here some simple outputs for node, npm and meteor versions, to hopefully allow us to catch such discrepancies more easily in the future
2021-10-19 21:03:17 +00:00
Anton Georgiev
c283c8155f build: Remove node-sass rebuild (not needed for node 14) 2021-10-19 21:02:12 +00:00
Charlie Arehart
fa65382b9e correct typo: occurs here and front install page
also found it here https://docs.bigbluebutton.org/2.3/install.html, but I don't find that text anywhere else in this repo
2021-10-19 21:01:30 +00:00
Anton Georgiev
9d24421b09
Merge pull request #13520 from prlanzarin/u24-zones
build: adjust bbb-html5.nginx to make sure nginx serves static assets
2021-10-19 16:40:15 -04:00
prlanzarin
e53dc4bb45 build: adjust bbb-html5.nginx to make sure nginx serves static assets
Somewhere along the line since 2.3 the packaged bbb-html5.nginx regressed to a
state where the upstream for /html5client was Meteor itself, which means nginx
wasn't serving static assets as it was supposed to.
2021-10-19 15:06:24 +00:00
Anton Georgiev
c1c357bbd9
Merge pull request #13482 from prlanzarin/u24-zones
refactor(virtual-backgrounds): move WASM binaries to /public and let nginx serve them
2021-10-18 12:16:14 -04:00
prlanzarin
b104984364 build: precompress tflite WASM binaries in build 2021-10-18 16:02:29 +00:00
Anton Georgiev
9649483cd4
Merge pull request #13509 from antobinary/fix-build-freeswitch
build: switch bbb-freeswitch-core to build from master; cleanup
2021-10-17 22:24:47 -04:00
Anton Georgiev
5ca6e3e3ba remove unneeded pip3 code 2021-10-17 21:51:15 -04:00
Anton Georgiev
45d848ca8a build: bbb-freeswitch-core install pip3 to solve site-packages missing 2021-10-17 20:24:54 -04:00
zfgrnzfsberire
8e9bcc4eb2
use placeholder files during change detection
also fix comment at top of script to reflect the current development state
2021-10-16 13:52:44 +02:00
prlanzarin
4f3ceb2459 build: serve precompressed tflite WASM binaries 2021-10-15 17:19:41 +00:00
Anton Georgiev
719afa6cd2 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-dev 2021-10-14 15:14:22 +00:00
Anton Georgiev
24d672a832 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-dev 2021-10-14 15:13:17 +00:00
Anton Georgiev
1b19ba7868
Merge pull request #13469 from antobinary/2.4-build-updates
build: set jdk to 8 in bbb-web
2021-10-14 11:10:21 -04:00
Anton Georgiev
58d5315b23
Merge pull request #13471 from antobinary/build-fs-command
build: bbb-fs-core allow trace @ command
2021-10-14 11:10:04 -04:00
Anton Georgiev
e6c091c86e
Merge pull request #13470 from antobinary/build-etherpad-cursortrace
build: etherpad cursortrace mconf
2021-10-14 11:09:53 -04:00
Anton Georgiev
9c2f85ceea
Merge pull request #13479 from prlanzarin/u24-ferrofluid
build: set mediasoup IPs in webrtc-sfu post install
2021-10-14 09:28:02 -04:00
Anton Georgiev
164258274b
Merge pull request #13451 from schrd/bbb-webrtc-package-size
Update bbb-webrtc-sfu packaging to include mediasoup
2021-10-14 09:24:21 -04:00
Anton Georgiev
ca054d356f
Update build/packages-template/bbb-webrtc-sfu/build.sh 2021-10-14 09:24:12 -04:00
schrd
4bc55226b1
Update build/packages-template/bbb-webrtc-sfu/build.sh
Co-authored-by: Paulo Lanzarin <4529051+prlanzarin@users.noreply.github.com>
2021-10-14 15:18:50 +02:00
Anton Georgiev
906b4253de
Merge pull request #13403 from prlanzarin/u24-parasole
chore(build): bbb-conf and build script changes to handle /var/mediasoup
2021-10-14 09:11:14 -04:00
prlanzarin
96254f7c89 build: add /wasm location block to bbb-html5.nginx
Guarantees that nginx will be the one serving the WASM binaries (static assets).

The types block is there to guarantee that the correct MIME type is advertised.

Moreoever, it's preferable that the WASM binaries are gzipped because they're
too large to ignore, so it's worth the server-side gzipping overhead.
The explicit gzip type declaration is there because only text/html assets are
compressed by default.
2021-10-14 03:58:55 +00:00
prlanzarin
95c31aa571 chore(build): verify that /var/mediasoup has correct ownership and perms 2021-10-13 14:37:21 +00:00
prlanzarin
1a439a371c chore(build): make sure /var/mediasoup is created (webrtc-sfu) 2021-10-13 14:37:21 +00:00
prlanzarin
7e49069add build: set mediasoup IPs in webrtc-sfu post install 2021-10-13 13:39:14 +00:00
Anton Georgiev
401adf6c3c build: bbb-fs-core allow trace @ command 2021-10-12 21:26:41 +00:00
Anton Georgiev
a69d74e659 build: etherpad cursortrace mconf 2021-10-12 21:24:14 +00:00
Anton Georgiev
7c84b91660 build: set jdk to 8 in bbb-web 2021-10-12 21:20:57 +00:00
Daniel Schreiber
c5f351d238 Update bbb-webrtc-sfu packaging to include mediasoup and ...
... drop build artifacts from compiling mediasoup. This reduces package
size from ~ 54 MB to ~ 12 MB.

Additionally this drops the `npm rebuild` command from the after-install
script. It should not be necessary to recompile stuff during
installation. To ensure a clean `node_modules` directory, it will be
cleaned in the before-install script.
2021-10-08 22:54:57 +02:00
Anton Georgiev
2684ef2df9 build: update FS build instructions to match 2.4-rc-2 2021-10-07 15:29:23 +00:00
Anton Georgiev
64a24a244f build: remove obsolete bbb-html5/m 2021-10-07 15:28:26 +00:00
Anton Georgiev
5bf2d712d1
Merge pull request #13429 from prlanzarin/u24-poly-pineapple
refactor(build, conf): webrtc-sfu's localIpAddress config is defunct
2021-10-07 08:43:56 -04:00
Gustavo Trott
52beb3a1bd Set ram limit to Sudoers in package script 2021-10-07 09:12:39 -03:00
prlanzarin
ca8df23002 refactor(build): webrtc-sfu`s localIpAddress is defunct 2021-10-06 22:53:04 +00:00
Anton Georgiev
d114983cbd build: Rely on meteor version from docker image 2021-09-30 20:43:48 +00:00
Anton Georgiev
8f7e1beb07
build: Specify meteor version before building
This resolves an issue where we were building the npm dependencies against Meteor matching Node 12 but were trying to install locally for Node 14.

An additional change to consider could be to include the correct Meteor version in the Dockerfile for BBB but that may mean different images per BBB version.

I also leave here some simple outputs for node, npm and meteor versions, to hopefully allow us to catch such discrepancies more easily in the future
2021-09-30 11:36:03 -04:00
Anton Georgiev
c324a45245
build: Remove node-sass rebuild (not needed for node 14) 2021-09-29 16:14:17 -04:00
Charlie Arehart
2898ca1a08
correct typo: occurs here and front install page
also found it here https://docs.bigbluebutton.org/2.3/install.html, but I don't find that text anywhere else in this repo
2021-09-27 07:42:11 -05:00
Michael F. Schönitzer
04d7ffae0d
Set worker_rlimit_nofile only once in nginx.conf
worker_rlimit_nofile may only be set once in nginx.conf. So far there was no check whether it is already set to a value different than 10000. This results in the option beeing set twice in the config file, if it was already set by. This caused nginx to fail startup. Now it is checked that the limit is at least 10000 and only if not it is set to 10000.
2021-09-21 14:24:52 +02:00
Daniel Schreiber
3e447dee6e Update build scripts to reflect meteor update
nodejs needs to be updated to produce working packages
2021-09-17 17:30:05 +02:00
Anton Georgiev
3c1e94c3e1 packaging: renamed bbb-activity-report to bbb-learning-dashboard 2021-08-30 21:50:06 +00:00
znerol
ade03a81da fix: Remove spurious nginx error_page directive, refs: #13025 2021-08-18 16:59:05 +02:00
Johannes Barthel
1c3d303108 remove centos/amazon linux related files 2021-08-13 14:07:54 +02:00
Johannes Barthel
7b14619ceb add link to dockerfile repo in documentation 2021-08-13 13:39:52 +02:00
Johannes Barthel
6c8525ef54 initial public version 2021-08-13 12:53:18 +02:00