lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reverting unnecessary changes

This commit is contained in:
bruckwubete 2018-07-04 15:24:01 -04:00
parent 3bb0c26f33
commit b51ac6aa7c
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
config/application.rb
View File

@ -19,20 +19,29 @@ module Greenlight
config.loadbalanced_configuration = ENV["LOADBALANCER_ENDPOINT"].present? && ENV["LOADBALANCER_SECRET"].present? config.loadbalanced_configuration = ENV["LOADBALANCER_ENDPOINT"].present? && ENV["LOADBALANCER_SECRET"].present?
# Setup BigBlueButton configuration.
if config.loadbalanced_configuration
# Fetch credentials from a loadbalancer based on provider.
config.loadbalancer_endpoint = ENV["LOADBALANCER_ENDPOINT"]
config.loadbalancer_secret = ENV["LOADBALANCER_SECRET"]
else
# Default credentials (test-install.blindsidenetworks.com/bigbluebutton).
config.bigbluebutton_endpoint_default = "http://test-install.blindsidenetworks.com/bigbluebutton/api/"
config.bigbluebutton_secret_default = "8cd8ef52e8e101574e400365b55e11a6"
# Default credentials (test-install.blindsidenetworks.com/bigbluebutton). # Use standalone BigBlueButton server.
config.bigbluebutton_endpoint_default = "http://test-install.blindsidenetworks.com/bigbluebutton/api" config.bigbluebutton_endpoint = ENV["BIGBLUEBUTTON_ENDPOINT"]
config.bigbluebutton_secret_default = "8cd8ef52e8e101574e400365b55e11a6" config.bigbluebutton_secret = ENV["BIGBLUEBUTTON_SECRET"]
# Fallback to testing credentails.
if config.bigbluebutton_endpoint.blank?
config.bigbluebutton_endpoint = config.bigbluebutton_endpoint_default
config.bigbluebutton_secret = config.bigbluebutton_secret_default
end
# Fetch credentials from a loadbalancer based on provider. # Fix endpoint format if required.
config.loadbalancer_endpoint = ENV["LOADBALANCER_ENDPOINT"] config.bigbluebutton_endpoint += "api/" unless config.bigbluebutton_endpoint.ends_with?('api/')
config.loadbalancer_secret = ENV["LOADBALANCER_SECRET"] end
# Use standalone BigBlueButton server.
config.bigbluebutton_endpoint = ENV["BIGBLUEBUTTON_ENDPOINT"] || config.bigbluebutton_endpoint_default
config.bigbluebutton_endpoint += "api" unless config.bigbluebutton_endpoint.ends_with?('api')
config.bigbluebutton_secret = ENV["BIGBLUEBUTTON_SECRET"] || config.bigbluebutton_secret_default
# Determine if GreenLight should allow non-omniauth signup/login. # Determine if GreenLight should allow non-omniauth signup/login.
config.allow_user_signup = (ENV['ALLOW_GREENLIGHT_ACCOUNTS'] == "true") config.allow_user_signup = (ENV['ALLOW_GREENLIGHT_ACCOUNTS'] == "true")
@ -40,4 +49,4 @@ module Greenlight
# Configure custom banner message. # Configure custom banner message.
config.banner_message = ENV['BANNER_MESSAGE'] config.banner_message = ENV['BANNER_MESSAGE']
end end
end end