From c2e6fb9a72b2b2fda57ab2fbe1f3f000c947c7f9 Mon Sep 17 00:00:00 2001 From: Anton Georgiev <anto.georgiev@gmail.com> Date: Wed, 18 May 2016 17:34:30 +0000 Subject: [PATCH] undo some of the webrtc ds record changes --- .../core/lib/recordandplayback/deskshare_archiver.rb | 1 - record-and-playback/core/scripts/bigbluebutton.yml | 3 ++- .../presentation/scripts/process/presentation.rb | 4 ++-- video-broadcast/.gitignore | 5 ----- 4 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 video-broadcast/.gitignore diff --git a/record-and-playback/core/lib/recordandplayback/deskshare_archiver.rb b/record-and-playback/core/lib/recordandplayback/deskshare_archiver.rb index 829e7493b8..2b85c69950 100755 --- a/record-and-playback/core/lib/recordandplayback/deskshare_archiver.rb +++ b/record-and-playback/core/lib/recordandplayback/deskshare_archiver.rb @@ -36,4 +36,3 @@ module BigBlueButton end end end - diff --git a/record-and-playback/core/scripts/bigbluebutton.yml b/record-and-playback/core/scripts/bigbluebutton.yml index 687f2a9729..46a9a16ca0 100755 --- a/record-and-playback/core/scripts/bigbluebutton.yml +++ b/record-and-playback/core/scripts/bigbluebutton.yml @@ -7,6 +7,7 @@ raw_presentation_src: /var/bigbluebutton redis_host: 127.0.0.1 redis_port: 6379 + # For PRODUCTION log_dir: /var/log/bigbluebutton recording_dir: /var/bigbluebutton/recording @@ -20,4 +21,4 @@ playback_protocol: http #log_dir: /home/ubuntu/temp/log #recording_dir: /home/ubuntu/temp/recording #published_dir: /home/ubuntu/temp/published -#playback_host: 192.168.23.137 +#playback_host: 192.168.22.137 diff --git a/record-and-playback/presentation/scripts/process/presentation.rb b/record-and-playback/presentation/scripts/process/presentation.rb index bcafbb6359..2369f952df 100755 --- a/record-and-playback/presentation/scripts/process/presentation.rb +++ b/record-and-playback/presentation/scripts/process/presentation.rb @@ -21,10 +21,10 @@ # For DEVELOPMENT # Allows us to run the script manually -require File.expand_path('../../../../core/lib/recordandplayback', __FILE__) +# require File.expand_path('../../../../core/lib/recordandplayback', __FILE__) # For PRODUCTION -# require File.expand_path('../../../lib/recordandplayback', __FILE__) +require File.expand_path('../../../lib/recordandplayback', __FILE__) require 'rubygems' require 'trollop' diff --git a/video-broadcast/.gitignore b/video-broadcast/.gitignore deleted file mode 100644 index 27584657a6..0000000000 --- a/video-broadcast/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -bin -build -dist -lib -build -- GitLab