Merge branch 'master' of https://github.com/bigbluebutton/greenlight2

config/environments/production.rb

@@ -87,6 +87,7 @@ Rails.application.configure do
   config.active_record.dump_schema_after_migration = false
 
   # Set the relative url root for deployment to a subdirectory.
-  config.relative_url_root = "/"
-  config.relative_url_root = ENV['RELATIVE_URL_ROOT'] if ENV['RELATIVE_URL_ROOT'].present?
+  if ENV['RELATIVE_URL_ROOT'] != "/"
+    config.relative_url_root = ENV['RELATIVE_URL_ROOT'] || "/b"
+  end
 end

config/puma.rb

@@ -11,7 +11,7 @@ threads threads_count, threads_count
 
 # Specifies the `port` that Puma will listen on to receive requests, default is 3000.
 #
-port        ENV.fetch("PORT") { 3000 }
+port        ENV.fetch("PORT") { 80 }
 
 # Specifies the `environment` that Puma will run in.
 #

config/routes.rb

@@ -24,9 +24,6 @@ Rails.application.routes.draw do
     patch '/:user_uid/edit', to: 'users#update', as: :update_user
   end
 
-  # Handles launches from a trusted launcher.
-  post '/launch', to: 'sessions#launch'
-
   # Handles Omniauth authentication.
   match '/auth/:provider/callback', to: 'sessions#omniauth', via: [:get, :post], as: :omniauth_session
   get '/auth/failure', to: 'sessions#fail'
@@ -39,7 +36,6 @@ Rails.application.routes.draw do
     post '/', to: 'rooms#join'
     post '/start', to: 'rooms#start', as: :start_room
     get '/logout', to: 'rooms#logout', as: :logout_room
-    post '/home', to: 'rooms#home', as: :make_home
 
     # Mange recordings.
     scope '/:record_id' do