merge gitlab+server histories

This commit is contained in:
Kiara Grouwstra 2021-12-04 20:53:33 +01:00
parent 2dccd3fd93
commit 0c776c240e
1 changed files with 2 additions and 6 deletions

View File

@ -17,7 +17,7 @@ module Ingang
# the framework and any gems in your application.
# Default credentials (test-install.blindsidenetworks.com/bigbluebutton).
config.bigbluebutton_endpoint_default = "https://vergadering.bij1.org/bigbluebutton/api"
config.bigbluebutton_endpoint_default = "https://bigbluebutton3.bij1.org/bigbluebutton/api"
# Use standalone BigBlueButton server.
config.bigbluebutton_endpoint = if ENV["BIGBLUEBUTTON_ENDPOINT"].present?
@ -26,11 +26,7 @@ module Ingang
config.bigbluebutton_endpoint_default
end
config.bigbluebutton_secret = if ENV["BIGBLUEBUTTON_SECRET"].present?
ENV["BIGBLUEBUTTON_SECRET"]
else
config.bigbluebutton_secret_default
end
config.bigbluebutton_secret = ENV["BIGBLUEBUTTON_SECRET"]
# Tell Action Mailer to use smtp server, if configured
config.action_mailer.delivery_method = ENV['SMTP_SERVER'].present? ? :smtp : :sendmail