forked from External/greenlight
configuration_updates
This commit is contained in:
parent
e5c31f81c2
commit
68d3e8da5a
|
@ -0,0 +1,20 @@
|
|||
# git
|
||||
.git
|
||||
.gitignore
|
||||
README.md
|
||||
|
||||
# Rails
|
||||
.env
|
||||
.env.prod
|
||||
*.rbc
|
||||
capybara-*.html
|
||||
.rspec
|
||||
log
|
||||
tmp
|
||||
/db/**/*.sqlite3
|
||||
/db/**/*.sqlite3-journal
|
||||
public/system
|
||||
coverage/
|
||||
spec/tmp
|
||||
.rvmrc
|
||||
scripts/
|
|
@ -22,12 +22,14 @@
|
|||
|
||||
<%= render 'shared/title', title: t('start_new_session') %>
|
||||
|
||||
<%= render layout: 'shared/center_panel' do %>
|
||||
<div class="center-block col-sm-8">
|
||||
<%= render 'shared/meeting_url', hidden: false %>
|
||||
<%= render 'shared/join_form' %>
|
||||
</div>
|
||||
<% end %>
|
||||
<div class="center-panel-wrapper">
|
||||
<%= render layout: 'shared/center_panel' do %>
|
||||
<div class="center-block col-sm-8">
|
||||
<%= render 'shared/meeting_url', hidden: false %>
|
||||
<%= render 'shared/join_form' %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -63,9 +63,11 @@ Rails.application.configure do
|
|||
# Set this to true and configure the email server for immediate delivery to raise delivery errors.
|
||||
# config.action_mailer.raise_delivery_errors = false
|
||||
|
||||
# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
|
||||
# the I18n.default_locale when a translation cannot be found).
|
||||
config.i18n.fallbacks = true
|
||||
# action cable socket URI
|
||||
config.action_cable.url = "ws://#{ENV['HOSTNAME']}/cable" # TODO this should use WSS protocol
|
||||
|
||||
# allowed action cable origins
|
||||
config.action_cable.allowed_request_origins = ["https://#{ENV['HOSTNAME']}", "http://#{ENV['HOSTNAME']}"]
|
||||
|
||||
# Send deprecation notices to registered listeners.
|
||||
config.active_support.deprecation = :notify
|
||||
|
|
|
@ -9,7 +9,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") { 9292 }
|
||||
|
||||
# Specifies the `environment` that Puma will run in.
|
||||
#
|
||||
|
|
|
@ -6,7 +6,6 @@ services:
|
|||
- '80:80'
|
||||
volumes:
|
||||
- '.:/usr/src/app'
|
||||
- '~/.ssh:/root/.ssh/'
|
||||
volumes_from:
|
||||
- gem_cache
|
||||
expose:
|
||||
|
|
|
@ -14,4 +14,5 @@ GOOGLE_OAUTH2_ID=
|
|||
GOOGLE_OAUTH2_SECRET=
|
||||
|
||||
# For production
|
||||
SECRET_KEY_BASE=
|
||||
SECRET_KEY_BASE=
|
||||
HOSTNAME=
|
||||
|
|
Loading…
Reference in New Issue