From fe348e0065a0c6e0e78a46cb7a707b93e3f0db30 Mon Sep 17 00:00:00 2001
From: Felipe Cecagno <fcecagno@gmail.com>
Date: Wed, 28 Jan 2015 19:20:11 -0200
Subject: [PATCH] fixed the deploy scripts for record and playback
---
record-and-playback/core/Gemfile | 11 ++--
record-and-playback/core/Gemfile.lock | 84 ++++++++++++---------------
record-and-playback/deploy.sh | 34 +++++------
3 files changed, 56 insertions(+), 73 deletions(-)
diff --git a/record-and-playback/core/Gemfile b/record-and-playback/core/Gemfile
index 0382c3b7ad..aface29869 100644
--- a/record-and-playback/core/Gemfile
+++ b/record-and-playback/core/Gemfile
@@ -19,12 +19,9 @@
source "http://rubygems.org"
-gem "rspec", "2.0.0", :require => "spec"
-gem "cucumber", "0.9.2"
-gem "redis", "2.1.1"
-#gem "SystemTimer", "1.2.3"
-gem "nokogiri", "1.4.4"
-gem "resque", "1.15.0"
+gem "redis"
+gem "nokogiri"
+gem "resque"
gem "mime-types"
gem "streamio-ffmpeg"
gem "rubyzip"
@@ -32,3 +29,5 @@ gem "curb"
gem "builder"
gem "trollop"
gem "open4"
+gem "fastimage"
+gem "absolute_time"
diff --git a/record-and-playback/core/Gemfile.lock b/record-and-playback/core/Gemfile.lock
index 38b28850c2..8bb0f9b79c 100644
--- a/record-and-playback/core/Gemfile.lock
+++ b/record-and-playback/core/Gemfile.lock
@@ -1,65 +1,53 @@
GEM
remote: http://rubygems.org/
specs:
- SystemTimer (1.2.3)
- builder (2.1.2)
- cucumber (0.9.2)
- builder (~> 2.1.2)
- diff-lcs (~> 1.1.2)
- gherkin (~> 2.2.5)
- json (~> 1.4.6)
- term-ansicolor (~> 1.0.5)
- curb (0.7.15)
- diff-lcs (1.1.2)
- gherkin (2.2.9)
- json (~> 1.4.6)
- term-ansicolor (~> 1.0.5)
- json (1.4.6)
- mime-types (1.16)
- nokogiri (1.4.4)
- rack (1.2.2)
- redis (2.1.1)
- redis-namespace (0.10.0)
- redis (< 3.0.0)
- resque (1.15.0)
- json (~> 1.4.6)
- redis-namespace (>= 0.10.0)
+ addressable (2.3.6)
+ builder (3.2.2)
+ curb (0.8.6)
+ fastimage (1.6.4)
+ addressable (~> 2.3, >= 2.3.5)
+ mime-types (2.4.3)
+ mini_portile (0.6.1)
+ mono_logger (1.1.0)
+ multi_json (1.10.1)
+ nokogiri (1.6.4.1)
+ mini_portile (~> 0.6.0)
+ open4 (1.3.4)
+ rack (1.5.2)
+ rack-protection (1.5.3)
+ rack
+ redis (3.1.0)
+ redis-namespace (1.5.1)
+ redis (~> 3.0, >= 3.0.4)
+ resque (1.25.2)
+ mono_logger (~> 1.0)
+ multi_json (~> 1.0)
+ redis-namespace (~> 1.3)
sinatra (>= 0.9.2)
vegas (~> 0.1.2)
- rspec (2.0.0)
- rspec-core (= 2.0.0)
- rspec-expectations (= 2.0.0)
- rspec-mocks (= 2.0.0)
- rspec-core (2.0.0)
- rspec-expectations (2.0.0)
- diff-lcs (>= 1.1.2)
- rspec-mocks (2.0.0)
- rspec-core (= 2.0.0)
- rspec-expectations (= 2.0.0)
- rubyzip (0.9.4)
- sinatra (1.2.1)
- rack (~> 1.1)
- tilt (< 2.0, >= 1.2.2)
- streamio-ffmpeg (0.7.8)
- term-ansicolor (1.0.5)
- tilt (1.2.2)
- trollop (1.16.2)
- vegas (0.1.8)
+ rubyzip (1.1.6)
+ sinatra (1.4.5)
+ rack (~> 1.4)
+ rack-protection (~> 1.4)
+ tilt (~> 1.3, >= 1.3.4)
+ streamio-ffmpeg (1.0.0)
+ tilt (1.4.1)
+ trollop (2.0)
+ vegas (0.1.11)
rack (>= 1.0.0)
PLATFORMS
ruby
DEPENDENCIES
- SystemTimer (= 1.2.3)
builder
- cucumber (= 0.9.2)
curb
+ fastimage
mime-types
- nokogiri (= 1.4.4)
- redis (= 2.1.1)
- resque (= 1.15.0)
- rspec (= 2.0.0)
+ nokogiri
+ open4
+ redis
+ resque
rubyzip
streamio-ffmpeg
trollop
diff --git a/record-and-playback/deploy.sh b/record-and-playback/deploy.sh
index d2b692d9e0..e0ab20f743 100755
--- a/record-and-playback/deploy.sh
+++ b/record-and-playback/deploy.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-
#
# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
#
@@ -18,30 +17,25 @@
# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
#
-set -e
+set -xe
sudo cp core/Gemfile /usr/local/bigbluebutton/core/Gemfile
sudo rm -rf /usr/local/bigbluebutton/core/lib
sudo cp -r core/lib /usr/local/bigbluebutton/core/
sudo rm -rf /usr/local/bigbluebutton/core/scripts
sudo cp -r core/scripts /usr/local/bigbluebutton/core/
-sudo rm -rf /etc/bigbluebutton/god
-sudo cp -r core/god/god /etc/bigbluebutton/
-sudo rm -f /etc/init.d/bbb-record-core
-sudo cp core/god/initd.god /etc/init.d/bbb-record-core
-sudo chmod 0755 /etc/init.d/bbb-record-core
sudo rm -rf /var/bigbluebutton/playback/*
function deploy_format() {
- local formats=$1
- for format in $formats
- do
- playback_dir="$format/playback/$format"
- scripts_dir="$format/scripts"
- if [ -d $playback_dir ]; then sudo cp -r $playback_dir /var/bigbluebutton/playback/; fi
- if [ -d $scripts_dir ]; then sudo cp -r $scripts_dir/* /usr/local/bigbluebutton/core/scripts/; fi
- sudo mkdir -p /var/log/bigbluebutton/$format
- done
+ local formats=$1
+ for format in $formats
+ do
+ playback_dir="$format/playback/$format"
+ scripts_dir="$format/scripts"
+ if [ -d $playback_dir ]; then sudo cp -r $playback_dir /var/bigbluebutton/playback/; fi
+ if [ -d $scripts_dir ]; then sudo cp -r $scripts_dir/* /usr/local/bigbluebutton/core/scripts/; fi
+ sudo mkdir -p /var/log/bigbluebutton/$format /var/bigbluebutton/published/$format /var/bigbluebutton/recording/publish/$format
+ done
}
# deploy_format "slides"
@@ -56,10 +50,12 @@ sudo mkdir -p /var/bigbluebutton/recording/status/archived/
sudo mkdir -p /var/bigbluebutton/recording/status/processed/
sudo mkdir -p /var/bigbluebutton/recording/status/sanity/
-sudo mv /usr/local/bigbluebutton/core/scripts/*.nginx /etc/bigbluebutton/nginx/
-sudo chown -R tomcat6:tomcat6 /var/bigbluebutton/ /var/log/bigbluebutton/
+sudo chown -R tomcat7:tomcat7 /var/bigbluebutton/ /var/log/bigbluebutton/
sudo chown -R red5:red5 /var/bigbluebutton/deskshare/
sudo chown -R freeswitch:daemon /var/bigbluebutton/meetings/
cd /usr/local/bigbluebutton/core/
-sudo bundle install
\ No newline at end of file
+sudo bundle install
+
+sudo mv /usr/local/bigbluebutton/core/scripts/*.nginx /etc/bigbluebutton/nginx/
+sudo service nginx reload
--
GitLab