BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,921 Commits 13 Branches 260 Tags 1.1 GiB
0acb3b5750
Commit Graph

447 Commits

Author SHA1 Message Date
Fred Dixon
52d2f69f82 Update bbb-conf 
Properly detect if bbb-html5 is installed
 2015-03-13 15:41:52 -04:00
Fred Dixon
bc736f74bc Update bbb-conf 
Remove hard-coded IP address (used for testing)
 2015-03-12 20:16:47 -04:00
Fred Dixon
2d4b1decda Update bbb-conf 
Fixed spelling error
 2015-03-12 19:58:34 -04:00
Fred Dixon
0fc048af0d Update bbb-conf 
Commented # set -x to turn off echoing of statements
 2015-03-12 19:58:06 -04:00
Fred Dixon
834662aef1 Updates to bbb-conf to start/stop meteor (bbb-html5 server) 2015-03-12 19:41:26 -04:00
Calvin Walton
746451b999 Allow forcing 'no marks' recordings to be processed with bbb-record --rebuild 
Some logic updates to make it more consistant with the bbb-record --delete
ordering too, to reduce races with the rap-worker.
 2015-03-11 13:40:56 -04:00
Calvin Walton
aa0aaf2300 Clean up the bbb-record --republish logic 
It's a bit simpler now, and does things in the correct order to avoid races
with the rap-worker.
 2015-03-11 11:18:57 -04:00
Calvin Walton
789c55d462 Fix bbb-record --republish 
With the new rap worker, it has to recreate the processed done file in order
to trigger the publishing step.
 2015-03-11 11:01:53 -04:00
Calvin Walton
e30ccd0983 bbb-record: also delete the sanity '.fail' file on rebuild 
This allows a rebuild to redo the sanity check if needed.
 2015-01-30 10:21:09 -05:00
Felipe Cecagno
8e12c909c5 Merge branch '090-encrypted-recording' into HEAD 
Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	record-and-playback/core/Gemfile
	record-and-playback/deploy.sh
 2015-01-21 15:51:29 -02:00
Fred Dixon
8b2eb5e478 Merge branch 'bbb-conf-fix' of https://github.com/ffdixon/bigbluebutton into ffdixon-bbb-conf-fix 2014-11-27 14:47:43 -05:00
Fred Dixon
989fd6a122 Fixed bug that caused nested XML comments from multiple invocations of sudo bbb-conf --disablewebrtc 2014-11-27 14:38:58 -05:00
Fred Dixon
2f238d0e5e Added support for client system check in bbb-conf 
bbb-conf now
  - prints out the host in /var/www/bigbluebutton/check/config.xml
  - updates above config.xml with sudo bbb-conf --setip
 2014-11-12 16:00:21 -05:00
Fred Dixon
0aa299657f Detect first if FreeSWITCH is listening in bbb-conf --check before matching with IP addresses 2014-10-25 17:37:40 -04:00
Fred Dixon
6d26b076d3 Added detection for OpenVZ IP address in bbb-conf 2014-09-17 17:37:43 -04:00
Fred Dixon
9e3c96683d Now updates sip.nginx for enabling nginx to proxy web services calls for SIP connections from client 2014-09-14 19:42:02 -04:00
Fred Dixon
f305a9b3cb Slightly lower memory check for 4G for servers to avoid warnings on servers with close to 4G 2014-09-14 14:09:15 -04:00
Felipe Cecagno
f68b0e4a16 cleanup 2014-09-01 17:53:57 -03:00
Jesus Federico
ecdcc45d9b bbb-lti: Updated bbb-conf to fix issue with re-installations 2014-08-29 15:32:34 -04:00
Jesus Federico
d0df58cf44 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-08-29 09:45:52 -07:00
Jesus Federico
4ea162adff Updated bbb-conf to support changes in bbb-lti configuration file 2014-08-29 12:44:26 -04:00
Fred Dixon
9380a73dac Added message to let administration know that monit will restart bbb-record-core and LibreOffice. Tweaked the language for audio settings dialog. 2014-08-28 17:39:59 -04:00
Fred Dixon
855891929f Changed warning for LibreOffice not running (monit may not have started it yet) 2014-08-23 18:43:58 -04:00
Fred Dixon
854e581cd5 text changes to bbb-conf and index.html 2014-08-21 20:49:23 -04:00
Fred Dixon
f704a2f3e6 Correctly stop libreoffice when doing sudo bbb-conf --clean 2014-08-20 07:08:39 -04:00
Fred Dixon
31b04303f9 Update start/stop logic for BigBlueButton to also stop monit (thanks Calvin) 2014-08-19 17:53:32 -04:00
Fred Dixon
f2efd93210 bbb-cond now ignores if redis.pass is blank in bigbluebutton.properties 2014-08-19 12:58:18 -04:00
Fred Dixon
de776dfa1b Minor bug fix in bbb-conf 2014-08-17 22:22:26 -04:00
Fred Dixon
e898ed14c5 Better display of enablewebertc and disablewebrtc messages from bbb-conf 2014-08-17 21:33:30 -04:00
Fred Dixon
f0638170b3 Omit directors for bbb-conf --debug 2014-07-25 18:43:02 -04:00
Calvin Walton
6135804596 bbb-record: Improve steps done in --delete and --deleteall 
It's now done in an order that should be less likely to cause
issues with a concurrent rap-worker process, and the files
deleted by --delete and --delete-all are now the same.
 2014-07-21 14:59:44 -04:00
Calvin Walton
8b507d621e bbb-record: Update 'rebuild' command for new rap-worker 
The new rap worker relies only on .done files for triggering, rather
than the absence of process/publish directories.
 2014-07-21 14:58:46 -04:00
Fred Dixon
86f9b53e88 Fix for issue #1720 2014-05-19 21:10:07 -04:00
Fred Dixon
7b0dd94f52 Removed duplicated code 2014-05-18 22:02:21 -04:00
Fred Dixon
6f6900200b minor fixes to bbb-conf 2014-05-01 03:03:31 +00:00
Gustavo Salazar
7d291abcfd delete old raw dir from published recordings 2014-04-14 15:14:14 -07:00
Fred Dixon
6424af41dc Algin calls in bbb-conf to bbb-record-core init.d script 2014-03-29 18:46:16 +00:00
Fred Dixon
45e03911ae Better matching for webRTC enabled in config.xml 2014-03-23 22:52:39 +00:00
Fred Dixon
3a2318c491 Removed debugging information 2014-03-23 22:35:09 +00:00
Richard Alam
401ac84e49 Merge branch 'master' into merge-polling-with-master 
Conflicts:
	bigbluebutton-config/bin/bbb-conf
 2014-03-19 13:59:03 +00:00
Fred Dixon
44e2255b59 reformatting of commands to enable/disable webRTC support 2014-03-16 19:55:16 +00:00
Fred Dixon
ae5316116e Small change to test build 2014-03-15 23:33:58 +00:00
Fred Dixon
7c9ed6b6ef Merged updates to enable/disable webrtc; removed obsolete references to asterisk 2014-03-13 01:04:58 +00:00
Fred Dixon
658adc13e7 Updates to bbb-conf and bbb-record for 0.9.0 2014-03-12 01:31:56 +00:00
Gustavo Salazar
c6c5c4b81f enable / disable webrtc 2014-03-10 14:16:37 -05:00
Fred Dixon
6e3985d202 Minor update to bbb-conf 2013-11-08 16:07:56 -05:00
Fred Dixon
91493dc624 fixed small bug in bbb-conf --setip for LTI 2013-09-26 17:19:47 -04:00
Fred Dixon
a84c6ca8e8 Configuration updates for moving to 0.81-RC2 2013-09-26 16:42:27 -04:00
Gustavo
0390c2c3c4 bbb-record update version 2013-09-23 23:16:04 +00:00
Gustavo
3e01ab5d29 republish only for matterhorn integration 2013-09-23 23:15:07 +00:00
Gustavo
6acbc14103 separate rebuild and rebuild all 2013-09-23 22:36:53 +00:00
Gustavo
d03114846a angle brackets for params 2013-09-23 21:51:46 +00:00
Calvin Walton
25dff30213 Add a big fat warning about the implications of leaving demos installed. 2013-08-30 17:03:54 -04:00
Calvin Walton
5267a7d2e1 Update the ffmpeg version check in bbb-conf 2013-08-27 11:04:02 -04:00
Calvin Walton
ab8882e50c Add an ffmpeg version check to bbb-conf --check 2013-07-23 15:47:54 -04:00
Jesus Federico
53dcbc82f8 bbb-lti: Restored xml extension to endPoint 2013-07-19 11:44:45 -04:00
Jesus Federico
dffdfa11ea bbb-lti: Simplified the url generation for the LTI xml cartridge 2013-07-18 16:48:48 -04:00
Fred Dixon
1c7d220edc Updated welcome message footer to 0.81-beta-2 2013-06-18 05:17:24 -07:00
Fred Dixon
e08c6802d4 Update configuration to record desktop sharing by default 2013-06-15 08:25:09 -07:00
Fred Dixon
4854934faf Added --setsecret and --secret 2013-06-15 02:28:18 -07:00
Fred Dixon
5b963b5c58 Added --setsecret 2013-06-14 23:38:19 -07:00
Fred Dixon
508c5e3b89 Output correct icon URL for LTI in bbb-conf --lti 2013-06-08 14:15:58 -07:00
Jesus Federico
d05a434d3f bbb-lti: Updated bbb-conf for fixing icon and base url 2013-06-08 13:26:04 -04:00
Fred Dixon
06c2480e10 Fixed typo 2013-05-09 16:49:08 -07:00
Fred Dixon
05597f12e3 bbb-conf now checks that the directory for serving the BigBlueButton client exists 2013-05-05 18:04:11 -04:00
Fred Dixon
abc074aaa1 Hide the network monitor and editing buttons for layouts module by defult 2013-04-16 19:23:20 -07:00
Fred Dixon
5d524be6b7 sudo bbb-conf --check now calls bbb-record --check to check for errors in recordings 2013-04-12 12:20:52 -04:00
Fred Dixon
071fb54b80 Added check to bbb-conf --check for ensuring ffmpeg is installed 2013-04-10 22:38:54 -04:00
Fred Dixon
777c3972d2 Updated bbb-conf to remove --setup-dev scripts. The script now refers developers to the wiki for detailed steps. 2013-04-10 22:07:22 -04:00
Fred Dixon
a8046aac78 Updates to bbb-conf to detect older version of bbb-freeswitch package 2013-04-09 20:42:38 -04:00
Gustavo Salazar
5b4c7307af more conditions to rearchive 2013-04-08 15:26:37 -05:00
Gustavo Salazar
d1e1f6e497 find meetingId instead of description 2013-04-08 11:15:46 -05:00
Gustavo Salazar
0a74b3a722 map external meeting id with internal meeting id and vice versa 2013-04-05 17:37:05 -05:00
Gustavo Salazar
48a81ab593 make description of recording optional in bbb-record --watch 2013-04-05 15:57:34 -05:00
Gustavo Salazar
c30da2c641 dont use rearchive until feature is complete 2013-04-03 19:48:32 -05:00
Gustavo Salazar
5611a385de Re-archive recording. Fix #1448 2013-04-03 19:13:02 -05:00
Gustavo Salazar
19d152ac80 enable or disable a recording workflow. Fix #1455 2013-04-03 18:01:38 -05:00
Fred Dixon
be24c16ca1 Updated bbb-conf to detect OpenOffice or LibreOffice 2013-03-29 22:00:46 -04:00
jfederico
2b23d9cea7 Merge branch 'bbb-lti_v0.1.1' 2013-03-13 11:30:46 -04:00
Fred Dixon
fc250716d9 Updated bbb-conf to support renaming of parameters (see issue 1398 in google issue tracker) 2013-02-03 17:08:38 -05:00
Fred Dixon
de47e2e65e Updated license header to LGPL 3.0 2013-01-27 09:44:40 -05:00
jfederico
a0df920587 bbb-lti(v0.1.1): Added new vie for extended interface 2013-01-24 15:52:06 -05:00
Fred Dixon
4035b4a732 The command now counts the number of slides using either the raw or presentation dir 2012-10-30 21:19:10 -04:00
Fred Dixon
b5abbd803a Added check to to check for mismatch salt in bbb-lti 2012-10-30 21:10:48 -04:00
Fred Dixon
83db16c293 Added support in bbb-conf to change hostname for LTI integration 2012-10-29 14:53:37 -04:00
Fred Dixon
db02664be3 bbb-conf --check now checks for bbb-lti package 2012-10-28 21:51:26 -04:00
Fred Dixon
f93c605149 Updated bbb-conf to detect if LTI package (bbb-lti) is installed and output configuration values with 'bbb-conf --lti' 2012-10-28 17:58:34 -04:00
Fred Dixon
d2c76c6120 Fixed typo in cut and paste 2012-10-25 18:49:18 -07:00
Fred Dixon
cbfb9027a1 Modified bbb-record --watch to use a combination of files in /var/bigbluebutton and /var/bigbluebutton/recording/raw as /var/bigbluebutton will have old files remove by /etc/cron.daily/bigbluebutton 2012-10-22 17:13:16 -04:00
Fred Dixon
f4fff9160c Also update hostname for metadata.xml in /var/bigbluebutton/published ... 2012-09-12 15:14:45 -04:00
Fred Dixon
11520ab392 bbb-conf --setip now updates the hostname for playback of recordings in metadata.xml 2012-09-12 14:53:21 -04:00
Fred Dixon
4b79d140ba bbb-record --check now checks if the IP address for a recording matches the value defined in bigbluebutton.properties 2012-09-12 14:52:36 -04:00
Gustavo Salazar
9b03ac4292 Use playerglobal 11.2 instead of 10.3 when setting development environment 2012-09-12 09:19:48 -05:00
Fred Dixon
f39eed5dfe reverted changes to bbb-conf 2012-09-11 18:45:16 -04:00
Fred Dixon
7bad4ffab8 Also delete sanity recordings in bbb-record --deleteall 2012-09-11 18:41:32 -04:00
gustavo salazar
6d90e31b85 Set playback_host in bigbluebutton.yml 2012-09-10 16:12:10 -05:00
Fred Dixon
d3b694167f Modified bbb-conf to not require slides.yml 2012-09-07 16:45:31 -04:00
Fred Dixon
e98d29e4b8 Added 'S' column in bbb-record --watch for Sanity check 2012-08-30 18:00:26 -04:00
Gustavo Salazar
59ac709833 Set ip address in presentation.yml using bbb-conf --setip. 2012-08-27 15:34:31 -05:00
Fred Dixon
9fa7cf3da6 Added bbb-record --clean to clean out process and publish log files for recordings 2012-08-21 21:05:22 -04:00
Fred Dixon
bcafbc6d48 Filter our ffmpeg output to stderror when looking for errors in /var/log/bigbluebutton/presentation/* and /var/log/bigbluebutton/slides/* 2012-08-21 20:51:24 -04:00
Fred Dixon
83006b0426 removed 'set -e' that was preventing bbb-record --debug from processing more log files 2012-08-21 20:43:31 -04:00
Fred Dixon
fe78f961bc Fixed error that was not searching /var/log/bigbluebutton/prentation log files for errors when doing bbb-record --debug 2012-08-21 20:13:50 -04:00
Fred Dixon
b2767aaf68 Output settings in red5 video for capture video (true/false) 2012-08-21 19:17:14 -04:00
Fred Dixon
263e20e8b3 Made bbb-record executable 2012-08-18 20:39:09 -04:00
Fred Dixon
fb58d0c7cc Updated bbb-conf for 0.81-dev 2012-08-18 18:33:37 -04:00
Gustavo Salazar
9b2c56a13a Republish recording using bbb-record utility. 2012-08-13 16:25:57 -05:00
Gustavo Salazar
e523dbf9e6 Merge pull request #55 from mconf/video-playback-into-master 
Video playback
 2012-08-03 09:08:25 -07:00
Felipe Cecagno
e8dc780c37 integrated the video playback into master, but the whiteboard events playback, as well as the presentation playback, is not functional yet - it seems that the writing.js is broken on master, tried to fix it without success 2012-08-01 17:40:58 -03:00
Gustavo Salazar
95d1a19e1e Download playerglobal 11.2 2012-08-01 15:51:50 -05:00
Fred Dixon
840b9c8368 Added check in bbb-conf to ensure beans.presentationService.defaultUploadedPresentation URL is reachable 2012-07-28 16:01:44 -04:00
Fred Dixon
113cbad759 Lowered check for 2G memory to under 1975 2012-05-11 09:49:58 -04:00
Markos Calderon
71cc44eac2 fix for issue 1221. However, need to double check which it's the best way to handle special characters 2012-05-17 15:12:42 -07:00
Fred Dixon
5ca7a51034 Added logic to clean more log files when running sudo bbb-conf --clean 2012-05-03 23:17:58 -04:00
Fred Dixon
cf003b06a1 Added sum of version numbers for packages in bbb-conf --check 2012-04-25 20:54:51 -04:00
Fred Dixon
8b7207622c bbb-conf --check now skips commented entries for sip.server.host 2012-03-17 11:39:56 -04:00
Gustavo Salazar
3ceb87ff59 Delete presentations of recording when using bbb-record --delete 
MEETING_Id.
 2012-03-14 10:08:25 -05:00
Richard Alam
4410956fc1 - missed one line with "source" dir 2012-03-09 19:32:14 +00:00
Fred Dixon
ef87f09ba6 Minor edits to bbb-conf 2012-03-04 22:16:37 -05:00
Fred Dixon
738efd4e48 Fixing typos in bbb-conf 2012-03-04 19:18:35 -05:00
Fred Dixon
6cb40fcb81 Improved warning messages for bbb-conf 2012-03-03 20:35:28 -05:00
Richard Alam
34d6ed968c add gradle resolveDeps into intructions 2012-02-28 11:06:10 -08:00
Richard Alam
ea599ff213 no need to modify anything in nginx for bbb-apps 2012-02-28 11:02:50 -08:00
Richard Alam
4b30333b0b - add tools option for --setup-dev 2012-03-02 19:03:24 +00:00
Fred Dixon
f220db6bf2 Minor updates 2012-03-02 10:53:07 -05:00
Fred Dixon
cd01147a1a Removed set -x debugging in bbb-record 2012-03-01 14:51:09 -05:00
Fred Dixon
16ffb35595 bbb-conf and bbb-record now print the current BigBlueButton version defined in /etc/bigbluebutton/bigbluebutton-release 2012-02-28 10:06:29 -05:00
Fred Dixon
6e507f89f0 Minor edits 2012-02-27 19:10:18 -05:00
Gustavo Salazar
d07efdc0fa Delete just one recording using bbb-record. 2012-02-27 11:40:35 -05:00
Fred Dixon
31a8332eb2 Added --check and --debug to bbb-record 2012-02-26 15:00:37 -05:00
Fred Dixon
f55f62d23b More updates to setting up the development environemnt. Now works on any user account on BigBlueButon server. Account must have sudo priviledges 2012-02-25 20:35:58 -05:00
Fred Dixon
1f2ded16f7 Modifications to bbb-conf to setup development environment for client on any account. 2012-02-23 13:52:13 -05:00
Fred Dixon
742df4e50a testing updates to steps to simplify setting up the development environment 2012-02-22 17:33:22 -05:00
Fred Dixon
24c1c69156 Added logic in build.xml to copy config.xml and join-mock.xml if not in the bigbluebutton-client source tree 2012-02-22 17:32:55 -05:00
Fred Dixon
fe61d3e7d5 Saving of desktop sharing video defaults to false (not needed for built-in slides) 2012-02-19 15:20:52 -05:00
Fred Dixon
cef4401df5 Updated error checking in bbb-record and error messages in bbb-conf 2012-02-19 12:34:21 -05:00
Fred Dixon
5b812140b7 Fixed error that would cause multiple IP addresses when checking for port 5060 and comparing it with sip.server.host 2012-02-12 11:47:56 -05:00
Fred Dixon
cb937ec129 changed --setfreeswitchip to --setsipip in bbb-conf 2012-02-10 14:45:41 -05:00
Fred Dixon
01d1fdd256 Updated bbb-conf to have more checks (and solutions) when it detects that BigBlueButton might not be connecting to FreeSWITCH 2012-01-21 16:40:40 -05:00
Fred Dixon
b8af5fb241 Added warning in bbb-conf for meaning of removeMeetingWhenEnded=false in /var/lib/tomcat6/webapps/bigbluebutton/WEB-INF/classes/bigbluebutton.properties 2012-01-19 21:33:04 -05:00
Fred Dixon
77bb96a0bb Testing with the BigBlueButton VM for setting up a development environment 2012-01-15 20:20:24 -05:00
gugat
3a72db66ba Change string to search the error about events because of encoding. "on ASCII" 2012-01-06 18:31:24 -05:00
gugat
a98fecc2c7 Check if ASCII problem exists when events are not archived. 2012-01-06 12:34:33 -05:00
gugat
ea2c453807 Add info log messages from each method of generators 
Add info log messages from publish script of slides. The log was empty before, was just created.
Add --check option to bbb-record. Taking same logic from bbb-conf and adding info about the failed task with each error.
 2012-01-05 17:07:34 -05:00
Fred Dixon
bb8b64aff6 removed --version flag from bbb-record 2011-12-08 15:10:53 -08:00
Fred Dixon
2e604558b8 bbb-conf now correctly checks out git-core when setting up development environment 2011-11-21 11:09:20 -08:00
Fred Dixon
80ebe82610 Added sorting of modification date to demo10.jsp 2011-11-21 09:20:31 -08:00
Fred Dixon
b627af54fe Added demo4/jquery.min.js (older version) for demo4.jsp 2011-11-20 11:15:07 -08:00
Fred Dixon
fc71c3c0eb Added more checks to bbb-record --watch to monitor the processing of a recording 2011-11-20 06:33:55 -08:00
Fred Dixon
1832ed1da4 Updating index.html for beta-3 2011-11-08 18:51:53 -08:00