+ <% if bigbluebutton_endpoint_default? %>
+
<%= t('warning_bigbluebutton_endpoint_default') %>
+ <% end %>
<%= yield :title %>
diff --git a/circle.yml b/circle.yml
index 014df8c7..0ad4951c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -14,4 +14,4 @@ deployment:
test:
pre:
- - cp env .env
+ - cp sample.env .env
diff --git a/config/application.rb b/config/application.rb
index 506b8928..a2a05fb8 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -37,13 +37,16 @@ module Greenlight
config.i18n.fallbacks = {'en' => 'en-US'}
# BigBlueButton
- config.bigbluebutton_endpoint = ENV['BIGBLUEBUTTON_ENDPOINT']
- config.bigbluebutton_secret = ENV['BIGBLUEBUTTON_SECRET']
+ config.bigbluebutton_endpoint_default = 'http://test-install.blindsidenetworks.com/bigbluebutton/'
+ config.bigbluebutton_secret_default = '8cd8ef52e8e101574e400365b55e11a6'
+ config.bigbluebutton_endpoint = ENV['BIGBLUEBUTTON_ENDPOINT'] || config.bigbluebutton_endpoint_default
+ config.bigbluebutton_secret = ENV['BIGBLUEBUTTON_SECRET'] || config.bigbluebutton_secret_default
- config.use_webhooks = ENV['GREENLIGHT_USE_WEBHOOKS'] == "true"
- config.mail_notifications = ENV['GREENLIGHT_MAIL_NOTIFICATIONS'] == "true"
- config.disable_guest_access = ENV['DISABLE_GUEST_ACCESS'] == "true"
- config.enable_youtube_uploading = ENV['ENABLE_YOUTUBE_UPLOADING'] == "true"
+ # Greelight specific
+ config.use_webhooks = ENV['GREENLIGHT_USE_WEBHOOKS'] && ENV['GREENLIGHT_USE_WEBHOOKS'] == "true"
+ config.mail_notifications = ENV['GREENLIGHT_MAIL_NOTIFICATIONS'] && ENV['GREENLIGHT_MAIL_NOTIFICATIONS'] == "true"
+ config.disable_guest_access = ENV['DISABLE_GUEST_ACCESS'] && ENV['DISABLE_GUEST_ACCESS'] == "true"
+ config.enable_youtube_uploading = ENV['ENABLE_YOUTUBE_UPLOADING'] && ENV['ENABLE_YOUTUBE_UPLOADING'] == "true"
# SMTP and action mailer
if config.mail_notifications
@@ -57,7 +60,7 @@ module Greenlight
config.smtp_starttls_auto = ENV['SMTP_STARTTLS_AUTO'].nil? ? true : ENV['SMTP_STARTTLS_AUTO']
config.smtp_tls = ENV['SMTP_TLS'].nil? ? false : ENV['SMTP_TLS']
- config.action_mailer.default_url_options = { host: ENV['GREENLIGHT_DOMAIN'] }
+ config.action_mailer.default_url_options = { host: ENV['GREENLIGHT_DOMAIN'] || 'localhost' }
config.action_mailer.delivery_method = :smtp
config.action_mailer.perform_deliveries = true
config.action_mailer.raise_delivery_errors = true
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 64b62eaf..3d33e756 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -1,24 +1,22 @@
Rails.application.config.providers = [:google, :twitter, :ldap]
-Rails.application.config.omniauth_google = ENV['GOOGLE_OAUTH2_ID'].present?
+Rails.application.config.omniauth_google = ENV['GOOGLE_OAUTH2_ID'].present? && ENV['GOOGLE_OAUTH2_SECRET'].present?
-Rails.application.config.omniauth_twitter = ENV['TWITTER_ID'].present?
+Rails.application.config.omniauth_twitter = ENV['TWITTER_ID'].present? && ENV['TWITTER_SECRET'].present?
-Rails.application.config.omniauth_ldap = ENV['LDAP_SERVER'].present?
+Rails.application.config.omniauth_ldap = ENV['LDAP_SERVER'].present? && ENV['LDAP_UID'].present? && ENV['LDAP_BASE'].present? && ENV['LDAP_BIND_DN'].present? && ENV['LDAP_PASSWORD'].present?
Rails.application.config.middleware.use OmniAuth::Builder do
provider :twitter, ENV['TWITTER_ID'], ENV['TWITTER_SECRET']
- provider :google_oauth2,
- ENV['GOOGLE_OAUTH2_ID'],
- ENV['GOOGLE_OAUTH2_SECRET'],
- scope: ENV['ENABLE_YOUTUBE_UPLOADING'] == 'true' ? ['profile', 'email', 'youtube', 'youtube.upload'] : ['profile', 'email'] ,
- access_type: 'online',
+ provider :google_oauth2, ENV['GOOGLE_OAUTH2_ID'], ENV['GOOGLE_OAUTH2_SECRET'],
+ scope: ENV['ENABLE_YOUTUBE_UPLOADING'] && ENV['ENABLE_YOUTUBE_UPLOADING'] == "true" ? ['profile', 'email', 'youtube', 'youtube.upload'] : ['profile', 'email'] ,
+ access_type: 'online',
name: 'google',
- hd: ENV['GOOGLE_OAUTH2_HD'].blank? ? nil : ENV['GOOGLE_OAUTH2_HD']
+ hd: ENV['GOOGLE_OAUTH2_HD']
provider :ldap,
host: ENV['LDAP_SERVER'],
- port: ENV['LDAP_PORT'],
- method: ENV['LDAP_METHOD'].present? ? ENV['LDAP_METHOD'].to_sym : :plain,
+ port: ENV['LDAP_PORT'] || '389',
+ method: (ENV['LDAP_METHOD'] || 'plain').to_sym,
allow_username_or_email_login: true,
uid: ENV['LDAP_UID'],
base: ENV['LDAP_BASE'],
@@ -37,10 +35,10 @@ OmniAuth.config.on_failure = Proc.new { |env|
module OmniAuthLDAPExt
def request_phase
-
+
rel_root = ENV['RELATIVE_URL_ROOT'].present? ? ENV['RELATIVE_URL_ROOT'] : '/b'
rel_root = '' if Rails.env == 'development'
-
+
@callback_path = nil
path = options[:callback_path]
options[:callback_path] = "#{rel_root}/auth/ldap/callback"
diff --git a/config/initializers/slack.rb b/config/initializers/slack.rb
index 886933f6..057a3e65 100644
--- a/config/initializers/slack.rb
+++ b/config/initializers/slack.rb
@@ -23,14 +23,15 @@ rescue URI::InvalidURIError
false
end
-if !ENV['SLACK_WEBHOOK'].nil? && !ENV['SLACK_WEBHOOK'].empty? && uri?(ENV['SLACK_WEBHOOK']) then
- # Initialize the slack notifier.
- Rails.application.config.slack_notifier = Slack::Notifier.new ENV['SLACK_WEBHOOK'] do
- defaults channel: ENV['SLACK_CHANNEL'],
- username: "BigBlueButton",
- icon_url: 'https://avatars3.githubusercontent.com/u/230228?v=3&s=200'
- end
-else
+if !ENV['SLACK_WEBHOOK'] || !ENV['SLACK_CHANNEL'] || !uri?(ENV['SLACK_WEBHOOK']) then
# Initialize it to nil (slack not configured)
Rails.application.config.slack_notifier = nil
+ return
+end
+
+# Initialize the slack notifier.
+Rails.application.config.slack_notifier = Slack::Notifier.new ENV['SLACK_WEBHOOK'] do
+ defaults channel: ENV['SLACK_CHANNEL'],
+ username: "BigBlueButton",
+ icon_url: 'https://avatars3.githubusercontent.com/u/230228?v=3&s=200'
end
diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml
index c2c0fc36..c138193a 100644
--- a/config/locales/en-us.yml
+++ b/config/locales/en-us.yml
@@ -187,6 +187,7 @@ en-US:
wait_for_mod_explanation: You will automatically join when the meeting starts
watch: Watch
'yes': 'Yes'
+ warning_bigbluebutton_endpoint_default: This deployment of Greenlight is making use of the BigBlueButton testing server that comes pre-configured by default. It should be replaced.
welcome_to_greenlight: Welcome to GreenLight!
youtube_description: This recording was recorded with BigBlueButton. For more information check out %{url}.
youtube_footer: this will upload all webcam and audio data
diff --git a/env b/env
deleted file mode 100644
index af1e2ef6..00000000
--- a/env
+++ /dev/null
@@ -1,124 +0,0 @@
-# Step 1 - Create a secret key for rails
-#
-# You can generate a secure one through the Greenlight docker image
-# with with the command
-#
-# docker run --rm bigbluebutton/greenlight rake secret
-#
-SECRET_KEY_BASE=
-# Step 2 - Enter credentials for your BigBlueButton Server
-#
-# The endpoint and secret from your bigbluebutton server. To get these values, run
-# the following command on your BigBlueButton server
-#
-# bbb-conf --secret
-#
-# and uncomment the following two variables
-#BIGBLUEBUTTON_ENDPOINT=
-#BIGBLUEBUTTON_SECRET=
-
-# Twitter Login Provider (optional)
-#
-# You will need to register the app at https://apps.twitter.com/
-# For the callback URL use 'http://
/auth/twitter/callback'
-# Once registered copy the ID and Secret here
-#
-TWITTER_ID=
-TWITTER_SECRET=
-
-# Google Login Provider (optional)
-#
-# You will need to register for at https://console.developers.google.com/apis/credentials
-# Select Oauth client ID -> web application
-# For the callback URL use 'http:///auth/google/callback'
-# Once registered copy the ID and Secret here
-#
-# The GOOGLE_OAUTH2_HD variable is used to limit sign-in to a particular Google Apps hosted domain. This
-# can be a string such as, 'domain.com'. If left blank, GreenLight will allow sign-in from all Google Apps hosted
-# domains.
-#
-GOOGLE_OAUTH2_ID=
-GOOGLE_OAUTH2_SECRET=
-GOOGLE_OAUTH2_HD=
-
-# LDAP Login Provider (optional)
-#
-# You can enable LDAP authentication by providing values for the variables below.
-# For information about setting up LDAP, see:
-# http://docs.bigbluebutton.org/install/green-light.html#ldap-oauth
-#
-LDAP_SERVER=
-LDAP_PORT=
-LDAP_METHOD=
-LDAP_UID=
-LDAP_BASE=
-LDAP_BIND_DN=
-LDAP_PASSWORD=
-
-# If "true", GreenLight will register a webhook callback for each meeting
-# created. This callback is called for all events that happen in the meeting,
-# including the processing of its recording. These events are used to update
-# the web page dynamically as things happen in the server.
-# If not "true", the application will add a metadata to the meetings with this same
-# callback URL. Scripts can then be added to BigBlueButton to call this callback
-# URL and send specific events to GreenLight (e.g. a post publish script to warn
-# the application when recordings are done).
-GREENLIGHT_USE_WEBHOOKS=false
-
-# Enable uploading to Youtube (optional)
-#
-# When this is enabled, users will be able to directly upload their recordings
-# to Youtube. If you plan to enable this, you should follow the steps outlined
-# in our docs for setting up the Youtube data API.
-#
-# http://docs.bigbluebutton.org/install/green-light.html#8-enabling-uploading-to-youtube-optional
-#
-ENABLE_YOUTUBE_UPLOADING=false
-
-# Slack Integration (optional)
-#
-# You will need to register an incoming-webhook for your slack channel
-# in order for GreenLight to post to it. You can do this by going
-# to https://slack.com/apps/A0F7XDUAZ-incoming-webhooks, selecting your
-# team and then selecting "Add Incoming WebHooks integration" on the
-# desired channel. You will then need to paste the webhook below.
-#
-SLACK_WEBHOOK=
-SLACK_CHANNEL=
-
-# Landing Background (optional)
-#
-# Supply a URL to an image to change the landing background. If no
-# URL is provided GreenLight will use a default image. If you
-# supply a path that does not lead to an image, no landing image
-# will appear.
-#
-LANDING_BACKGROUND=
-
-# SMTP Mailer
-#
-GREENLIGHT_MAIL_NOTIFICATIONS=true
-GREENLIGHT_DOMAIN=localhost-lxc.org
-SMTP_FROM=youremail@gmail.com
-SMTP_SERVER=smtp.gmail.com
-SMTP_PORT=587
-SMTP_DOMAIN=gmail.com
-SMTP_USERNAME=youremail@gmail.com
-SMTP_PASSWORD=yourpassword
-# SMTP_TLS=false
-# SMTP_AUTH=login
-# SMTP_STARTTLS_AUTO=true
-
-# Prefix for the application's root URL
-# Useful for deploying the application to a subdirectory
-#
-# default is '/b' (recommended)
-#
-#RELATIVE_URL_ROOT=/b
-
-# Uncomment and set to 'true' to only allow users to create meetings when authenticated.
-# Unauthenticated users are still able to join meetings through invites.
-#DISABLE_GUEST_ACCESS=false
-
-# Comment this out to send logs to STDOUT in production instead of log/production.log .
-DISABLE_RAILS_LOG_TO_STDOUT=true
diff --git a/sample.env b/sample.env
index 5d905b7b..b2afa132 100644
--- a/sample.env
+++ b/sample.env
@@ -1,11 +1,71 @@
-# This is a sample of the environment variables you will need for development
+# This is a sample of the environment variables you will need
# To use, copy this file to .env `cp sample.env .env`
-RAILS_ENV=development
-# BigBlueButton
-BIGBLUEBUTTON_ENDPOINT=
-BIGBLUEBUTTON_SECRET=
+# For production only
+
+# RAILS_ENV=production
+
+# Create a secret key for rails
+#
+# You can generate a secure one through the Greenlight docker image
+# with with the command
+#
+# docker run --rm bigbluebutton/greenlight rake secret
+#
+# SECRET_KEY_BASE=
+
+
+# For either developent or production
+
+# Enter credentials for your BigBlueButton Server
+#
+# The endpoint and secret from your bigbluebutton server. To get these values, run
+# the following command on your BigBlueButton server
+#
+# bbb-conf --secret
+#
+# and uncomment the following two variables
+# BIGBLUEBUTTON_ENDPOINT=http://test-install.blindsidenetworks.com/bigbluebutton/
+# BIGBLUEBUTTON_SECRET=8cd8ef52e8e101574e400365b55e11a6
+
+# Twitter Login Provider (optional)
+#
+# You will need to register the app at https://apps.twitter.com/
+# For the callback URL use 'http:///auth/twitter/callback'
+# Once registered copy the ID and Secret here
+#
+# TWITTER_ID=
+# TWITTER_SECRET=
+
+# Google Login Provider (optional)
+#
+# You will need to register for at https://console.developers.google.com/apis/credentials
+# Select Oauth client ID -> web application
+# For the callback URL use 'http:///auth/google/callback'
+# Once registered copy the ID and Secret here
+#
+# The GOOGLE_OAUTH2_HD variable is used to limit sign-in to a particular Google Apps hosted domain. This
+# can be a string such as, 'domain.com'. If left blank, GreenLight will allow sign-in from all Google Apps hosted
+# domains.
+#
+# GOOGLE_OAUTH2_ID=
+# GOOGLE_OAUTH2_SECRET=
+# GOOGLE_OAUTH2_HD=
+
+# LDAP Login Provider (optional)
+#
+# You can enable LDAP authentication by providing values for the variables below.
+# For information about setting up LDAP, see:
+# http://docs.bigbluebutton.org/install/green-light.html#ldap-oauth
+#
+# LDAP_SERVER=
+# LDAP_PORT=
+# LDAP_METHOD=
+# LDAP_UID=
+# LDAP_BASE=
+# LDAP_BIND_DN=
+# LDAP_PASSWORD=
# If "true", GreenLight will register a webhook callback for each meeting
# created. This callback is called for all events that happen in the meeting,
@@ -15,31 +75,63 @@ BIGBLUEBUTTON_SECRET=
# callback URL. Scripts can then be added to BigBlueButton to call this callback
# URL and send specific events to GreenLight (e.g. a post publish script to warn
# the application when recordings are done).
-GREENLIGHT_USE_WEBHOOKS=false
+# GREENLIGHT_USE_WEBHOOKS=true
-# The web site domain, needed for emails mostly
-GREENLIGHT_DOMAIN=localhost
+# Enable uploading to Youtube (optional)
+#
+# When this is enabled, users will be able to directly upload their recordings
+# to Youtube. If you plan to enable this, you should follow the steps outlined
+# in our docs for setting up the Youtube data API.
+#
+# http://docs.bigbluebutton.org/install/green-light.html#8-enabling-uploading-to-youtube-optional
+#
+# ENABLE_YOUTUBE_UPLOADING=false
-# Enable email notifications
-GREENLIGHT_MAIL_NOTIFICATIONS=true
+# Slack Integration (optional)
+#
+# You will need to register an incoming-webhook for your slack channel
+# in order for GreenLight to post to it. You can do this by going
+# to https://slack.com/apps/A0F7XDUAZ-incoming-webhooks, selecting your
+# team and then selecting "Add Incoming WebHooks integration" on the
+# desired channel. You will then need to paste the webhook below.
+#
+# SLACK_WEBHOOK=
+# SLACK_CHANNEL=
-# Email configurations
-SMTP_FROM=email@gmail.com
-SMTP_SERVER=smtp.gmail.com
-SMTP_DOMAIN=gmail.com
-SMTP_PORT=587
-SMTP_USERNAME=email@gmail.com
-SMTP_PASSWORD=my-secret-password
+# Landing Background (optional)
+#
+# Supply a URL to an image to change the landing background. If no
+# URL is provided GreenLight will use a default image. If you
+# supply a path that does not lead to an image, no landing image
+# will appear.
+#
+# LANDING_BACKGROUND=
+
+# SMTP Mailer (optional)
+#
+# GREENLIGHT_MAIL_NOTIFICATIONS=true
+# In the format [localhost.localdomain]
+# GREENLIGHT_DOMAIN=localhost
+# SMTP_FROM=youremail@gmail.com
+# SMTP_SERVER=smtp.gmail.com
+# SMTP_PORT=587
+# SMTP_DOMAIN=gmail.com
+# SMTP_USERNAME=youremail@gmail.com
+# SMTP_PASSWORD=yourpassword
# SMTP_TLS=false
# SMTP_AUTH=login
# SMTP_STARTTLS_AUTO=true
-# OmniAuth
-TWITTER_ID=
-TWITTER_SECRET=
-GOOGLE_OAUTH2_ID=
-GOOGLE_OAUTH2_SECRET=
+# Prefix for the application's root URL
+# Useful for deploying the application to a subdirectory
+#
+# default is '/b' (recommended)
+#
+# RELATIVE_URL_ROOT=/b
-# For production
-SECRET_KEY_BASE=
-HOSTNAME=
+# Uncomment and set to 'true' to only allow users to create meetings when authenticated.
+# Unauthenticated users are still able to join meetings through invites.
+# DISABLE_GUEST_ACCESS=false
+
+# Comment this out to send logs to STDOUT in production instead of log/production.log .
+DISABLE_RAILS_LOG_TO_STDOUT=true