diff --git a/record-and-playback/deploy.sh b/record-and-playback/deploy.sh index 1eec7dddb113dde297f6bc72f1541d93562fa3c6..310c2c86abad2c7ce875d0dae1472630d2a18370 100755 --- a/record-and-playback/deploy.sh +++ b/record-and-playback/deploy.sh @@ -18,7 +18,7 @@ # 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 diff --git a/record-and-playback/mconf_decrypter/scripts/mconf-decrypter.yml b/record-and-playback/mconf_decrypter/scripts/mconf-decrypter.yml index 9f286e7fe5ea889ffc0e423ed8f68d1322ed72fb..11247f4de9635ae3bf6e2dfe3c4b97567e439164 100644 --- a/record-and-playback/mconf_decrypter/scripts/mconf-decrypter.yml +++ b/record-and-playback/mconf_decrypter/scripts/mconf-decrypter.yml @@ -1,2 +1,2 @@ -get_recordings_url: http://localhost/bigbluebutton/api/getRecordings?checksum=39ebeadb772553a206d43857f6287b4536b1c32c +get_recordings_url: http://localhost:8080/bigbluebutton/api/getRecordings?checksum=1bc39cd242bb8f9b331af0d2323dc1ba3cabe2fe private_key: /usr/local/bigbluebutton/core/scripts/private.pem diff --git a/record-and-playback/mconf_encrypted/scripts/publish/mconf_encrypted.rb b/record-and-playback/mconf_encrypted/scripts/publish/mconf_encrypted.rb index 19e51893643dcaf225b8142a8ec6126ba6b69117..52e79027d99ae480cabf337007325ca0c3a2576d 100755 --- a/record-and-playback/mconf_encrypted/scripts/publish/mconf_encrypted.rb +++ b/record-and-playback/mconf_encrypted/scripts/publish/mconf_encrypted.rb @@ -144,12 +144,6 @@ done_files.each do |df| BigBlueButton.logger.info("Publishing files") FileUtils.cp_r(meeting_publish_dir, "#{published_dir}/mconf_encrypted") - BigBlueButton.logger.info("Removing processed files: #{meeting_process_dir}") - FileUtils.rm_r meeting_process_dir, :force => true - - BigBlueButton.logger.info("Removing published files: #{meeting_publish_dir}") - FileUtils.rm_r meeting_publish_dir, :force => true - # it doesn't work since video and deskshare files are owned by red5, # freeswitch files are owned by freeswitch, and this script is ran by # tomcat6, so it can just remove files owned by tomcat6 @@ -158,8 +152,7 @@ done_files.each do |df| Dir.glob("/var/freeswitch/meetings/#{meeting_id}*.wav") ], :force => true # Remove all the recording flags - FileUtils.rm_f [ "#{recording_dir}/status/processed/#{meeting_id}-mconf_encrypted.done", - "#{recording_dir}/status/sanity/#{meeting_id}.done", + FileUtils.rm_f [ "#{recording_dir}/status/sanity/#{meeting_id}.done", "#{recording_dir}/status/recorded/#{meeting_id}.done", "#{recording_dir}/status/archived/#{meeting_id}.done" ] @@ -168,6 +161,10 @@ done_files.each do |df| FileUtils.rm_r meeting_raw_dir, :force => true BigBlueButton.logger.info("Removing the recording presentation: #{meeting_raw_presentation_dir}") FileUtils.rm_r meeting_raw_presentation_dir, :force => true + + publish_done = File.new("#{recording_dir}/status/published/#{meeting_id}-mconf_encrypted.done", "w") + publish_done.write("Published #{meeting_id}") + publish_done.close end end end