diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..c5f500dd --- /dev/null +++ b/.dockerignore @@ -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/ diff --git a/app/views/landing/meetings.html.erb b/app/views/landing/meetings.html.erb index c2033119..10c10c24 100644 --- a/app/views/landing/meetings.html.erb +++ b/app/views/landing/meetings.html.erb @@ -22,12 +22,14 @@ <%= render 'shared/title', title: t('start_new_session') %> - <%= render layout: 'shared/center_panel' do %> -
- <%= render 'shared/meeting_url', hidden: false %> - <%= render 'shared/join_form' %> -
- <% end %> +
+ <%= render layout: 'shared/center_panel' do %> +
+ <%= render 'shared/meeting_url', hidden: false %> + <%= render 'shared/join_form' %> +
+ <% end %> +
diff --git a/config/environments/production.rb b/config/environments/production.rb index 6f2ca454..7b2ebfbc 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -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 diff --git a/config/puma.rb b/config/puma.rb index c7f311f8..c5d935d1 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -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. # diff --git a/docker-compose.yml b/docker-compose.yml index 48f53d1c..92621a65 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,6 @@ services: - '80:80' volumes: - '.:/usr/src/app' - - '~/.ssh:/root/.ssh/' volumes_from: - gem_cache expose: diff --git a/sample.env b/sample.env index f01527a4..d9dbc21f 100644 --- a/sample.env +++ b/sample.env @@ -14,4 +14,5 @@ GOOGLE_OAUTH2_ID= GOOGLE_OAUTH2_SECRET= # For production -SECRET_KEY_BASE= \ No newline at end of file +SECRET_KEY_BASE= +HOSTNAME=