forked from External/greenlight
		
	Merge pull request #20 from zach-chai/move_configuration
application configuration
This commit is contained in:
		@@ -1,10 +1,10 @@
 | 
				
			|||||||
module BbbApi
 | 
					module BbbApi
 | 
				
			||||||
  def bbb_endpoint
 | 
					  def bbb_endpoint
 | 
				
			||||||
    Rails.application.secrets[:bbb_endpoint]
 | 
					    Rails.configuration.bigbluebutton_endpoint
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def bbb_secret
 | 
					  def bbb_secret
 | 
				
			||||||
    Rails.application.secrets[:bbb_secret]
 | 
					    Rails.configuration.bigbluebutton_secret
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def bbb
 | 
					  def bbb
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,5 +11,8 @@ module Greenlight
 | 
				
			|||||||
    # Settings in config/environments/* take precedence over those specified here.
 | 
					    # Settings in config/environments/* take precedence over those specified here.
 | 
				
			||||||
    # Application configuration should go into files in config/initializers
 | 
					    # Application configuration should go into files in config/initializers
 | 
				
			||||||
    # -- all .rb files in that directory are automatically loaded.
 | 
					    # -- all .rb files in that directory are automatically loaded.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    config.bigbluebutton_endpoint = ENV['BIGBLUEBUTTON_ENDPOINT']
 | 
				
			||||||
 | 
					    config.bigbluebutton_secret = ENV['BIGBLUEBUTTON_SECRET']
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,20 +10,13 @@
 | 
				
			|||||||
# Make sure the secrets in this file are kept private
 | 
					# Make sure the secrets in this file are kept private
 | 
				
			||||||
# if you're sharing your code publicly.
 | 
					# if you're sharing your code publicly.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
default: &default
 | 
					 | 
				
			||||||
  bbb_endpoint: <%= ENV['BIGBLUEBUTTON_ENDPOINT'] %>
 | 
					 | 
				
			||||||
  bbb_secret: <%= ENV['BIGBLUEBUTTON_SECRET'] %>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
development:
 | 
					development:
 | 
				
			||||||
  <<: *default
 | 
					 | 
				
			||||||
  secret_key_base: d7d93ffde4e0eb407fd82d5ae207445834d2cef5acbfc2d42fa10be44f94a8342c82d2c9b4785e1e2ec9d135b7cd3dda443ea3da732ffb8ba182368f0909cfa5
 | 
					  secret_key_base: d7d93ffde4e0eb407fd82d5ae207445834d2cef5acbfc2d42fa10be44f94a8342c82d2c9b4785e1e2ec9d135b7cd3dda443ea3da732ffb8ba182368f0909cfa5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
test:
 | 
					test:
 | 
				
			||||||
  <<: *default
 | 
					 | 
				
			||||||
  secret_key_base: 16b4c8a9b05f13aa2430fbe55cc675a7b323deedaceb761e6fbb5aace1353354b14813ad58e71db07e5345934713bcf3401c62dce79696574ddece2b5360d953
 | 
					  secret_key_base: 16b4c8a9b05f13aa2430fbe55cc675a7b323deedaceb761e6fbb5aace1353354b14813ad58e71db07e5345934713bcf3401c62dce79696574ddece2b5360d953
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Do not keep production secrets in the repository,
 | 
					# Do not keep production secrets in the repository,
 | 
				
			||||||
# instead read values from the environment.
 | 
					# instead read values from the environment.
 | 
				
			||||||
production:
 | 
					production:
 | 
				
			||||||
  <<: *default
 | 
					 | 
				
			||||||
  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
 | 
					  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user