Commit Graph

1802 Commits

Author SHA1 Message Date
PravenJohn
ab637b8370
updating kurento conn string to the service name 2019-01-17 12:53:46 +05:30
PravenJohn
100d31dd01
Adding port 8021 used by fsesl 2019-01-16 19:43:29 +05:30
praven
62edac4912 Adding variables listed in the docker README 2019-01-16 12:44:57 +05:30
Fred Dixon
08f62e8144 Removed older Labs exampls 2018-12-17 16:57:36 -06:00
Ghazi Triki
653fd74440 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
#	bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/SvgImageCreatorImp.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/TextFileCreatorImp.java
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
#	bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
#	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
#	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/red5/flash/bwcheck/app/BandwidthDetectionApp.as
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/client/compatibility/kurento-extension.js
#	bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
2018-11-01 14:00:54 +01:00
Fred Dixon
3d20450629
Update default.example.yml
Temporary fix until we update the calculation of the pool size
2018-10-24 15:20:41 -04:00
prlanzarin
e83e881f77 Added edge case to error handling on base classes and SFU pipeline cleanup on room empty 2018-10-11 18:54:09 +00:00
prlanzarin
7f3d3c0d32 Fixed reconnecting webcam viewers and session overlaps 2018-10-11 18:23:26 +00:00
prlanzarin
16bfcb9f19 Making further use of the SFU-KMS websocket pool by making the kurento adapter a bit more stateless 2018-10-09 22:12:38 +00:00
prlanzarin
a7da78086f Make SFU connect to Kurento using multiple websockets 2018-10-09 16:59:42 +00:00
prlanzarin
27b1bca1e9 Unified SFU media server state code and fixed some issues with it 2018-10-09 16:55:15 +00:00
prlanzarin
db12a4f06d Added comments explaning SFUs config params and a new websocket pool config 2018-10-09 16:54:18 +00:00
prlanzarin
c8d5e65ea0 Add missing changes to SFU AudioManager 2018-10-03 20:44:17 +00:00
prlanzarin
0554083535 Added an ICE queue to AudioManager in SFU 2018-10-03 18:45:25 +00:00
prlanzarin
8150db9fb6 Improve codec availability detection in SFU 2018-09-18 18:52:15 +00:00
Ghazi Triki
83025a9d5e Merge remote-tracking branch 'bigbluebutton/master' into jvm-quality-improve
# Conflicts:
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
2018-09-12 18:49:25 +01:00
prlanzarin
dedffa9de2 Fixed exceptions on screenshare early exit 2018-09-11 20:08:15 +00:00
prlanzarin
3fa8c1c7b6 Fix inconsistent screenshare state on presenter switch during ongoing negotiation 2018-09-11 18:11:52 +00:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Chad Pilkey
c58d71533f
Merge pull request #6007 from fcecagno/multi-container-docker
Multi container docker
2018-09-04 15:30:30 -04:00
Felipe Cecagno
a64272d6c6 pull latest updates on the docs made by @mmarangoni 2018-08-31 10:18:43 -03:00
prlanzarin
dc767d9bdb Fixed server-side error handling for listen only via SFU, correctly handling KMS abrupt shutdown 2018-08-30 02:41:02 +00:00
Felipe Cecagno
d739b2c148 remove nginx-dhp; update docs (thanks to @mmarangoni) 2018-08-24 17:15:47 -03:00
Felipe Cecagno
8348d93b4c add greenlight to compose 2018-08-24 17:15:47 -03:00
Felipe Cecagno
714cd6c133 add domain to webhooks events 2018-08-24 17:15:47 -03:00
Felipe Cecagno
b540f40f06 fix kms container with configurable ws port 2018-08-24 17:15:47 -03:00
Felipe Cecagno
06e9b15358 - update webhooks to use the same message format for bearer auth or checksum
- make ws port configurable on kurento
2018-08-24 17:15:47 -03:00
Felipe Cecagno
22bf1e90cc modify config.bbb.auth2_0 modifying an environment variable 2018-08-24 17:15:47 -03:00
Felipe Cecagno
8e9a75d149 - reduce size of the bbb-html5 image
- fix path of the html5 config file to apply METEOR_SETTINGS
- remove TLS from coturn, in order to keep the ssl certificate on traefik only
- configure stun on bbb-web as well
- allow turn domain/address to be different from the server domain
2018-08-24 17:15:47 -03:00
Diego Sampaio
ec63729747 Add k8s 2018-08-24 17:15:47 -03:00
Felipe Cecagno
bd27c9bca6 put back nginx just to proxy freeswitch 2018-08-24 17:15:47 -03:00
Felipe Cecagno
9a7dbd0b9e remove nginx from build; add labels for traefik; expose port on bbb-webrtc-sfu 2018-08-24 17:15:47 -03:00
Diego Sampaio
9b8e1182ca Add traefik 2018-08-24 17:15:47 -03:00
Felipe Cecagno
3418c2458d change image names to avoid conflict with the official images 2018-08-24 17:15:47 -03:00
Felipe Cecagno
4857382969 fsesl wait for freeswitch; change links by depends_on; remove freeswitch ipv6 config files; enable wss-binding element on freeswitch; fix kurento listen only 2018-08-24 17:15:47 -03:00
Felipe Cecagno
ab9a31fe7d update Makefile 2018-08-24 17:15:47 -03:00
Felipe Cecagno
f6fa7e0945 add another property for redis on bbb-web; set freeswitch ip on webrtc-sfu; add volumes to store media files 2018-08-24 17:15:47 -03:00
Felipe Cecagno
4fdd686cfa update instructions and fix docker-compose to pull from docker hub 2018-08-24 17:15:47 -03:00
Felipe Cecagno
69d0805d44 implement a Makefile to automate docker images build 2018-08-24 17:15:47 -03:00
Felipe Cecagno
232c485762 revert some unneeded changes 2018-08-24 17:15:47 -03:00
Felipe Cecagno
4d72f5c3b6 remove unused libreoffice container 2018-08-24 17:15:47 -03:00
Felipe Cecagno
b91c13e054 update instructions and implementation of a working docker-compose (no recordings yet) 2018-08-24 17:15:47 -03:00
Felipe Cecagno
16a59b7e3e push unfinished work on docker 2018-08-24 17:15:47 -03:00
Felipe Cecagno
62311387b8 more changes to configure redis using environment variables 2018-08-24 17:15:47 -03:00
Felipe Cecagno
c2e507713a add a few docker containers definitions and compiled a list of what is still missing 2018-08-24 17:15:47 -03:00
Anton Georgiev
062bbc4a29
Make freeswitch.ip easier to regex match 2018-08-23 14:28:04 -04:00
Anton Georgiev
2b18bb3b75
Merge pull request #5996 from prlanzarin/cam-h264-prof-fix
Added preffered H264 profile to webcams on SFU
2018-08-21 15:24:00 -04:00
prlanzarin
defffe673a Added preffered H264 profile to webcams on SFU 2018-08-21 19:15:41 +00:00
Paulo Lanzarin
13df4322b6
Fixed default webcam target bitrate to 300 kbps 2018-08-20 18:02:46 -03:00
prlanzarin
080348f2e7 Added target bitrate options for video and screenshare in bbb-webrtc-sfu app 2018-08-20 17:57:08 +00:00