diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2015-12-16 18:15:59 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2015-12-16 18:17:12 +0100 |
| commit | 7eb12796cabb1d6784daf261ca8e344513cacede (patch) | |
| tree | f2e611e65d8875842984bf175f7c64354def43eb | |
| parent | aae14ab3ace13ef87431fcb8dd7efb3e5d5dfe44 (diff) | |
| download | rails-7eb12796cabb1d6784daf261ca8e344513cacede.tar.gz rails-7eb12796cabb1d6784daf261ca8e344513cacede.tar.bz2 rails-7eb12796cabb1d6784daf261ca8e344513cacede.zip | |
Assume that the cable server is running in-process by default, offer option to change that in config/environments/production.rb
| -rw-r--r-- | actioncable/lib/action_cable/engine.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/actioncable/lib/action_cable/engine.rb b/actioncable/lib/action_cable/engine.rb index e62413e9e3..9bb7ef5aff 100644 --- a/actioncable/lib/action_cable/engine.rb +++ b/actioncable/lib/action_cable/engine.rb @@ -6,6 +6,8 @@ require "active_support/core_ext/hash/indifferent_access" module ActionCable class Railtie < Rails::Engine # :nodoc: config.action_cable = ActiveSupport::OrderedOptions.new + config.action_cable.url = '/cable' + config.eager_load_namespaces << ActionCable initializer "action_cable.helpers" do diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt index a5302550fa..945e890e5f 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt @@ -40,6 +40,9 @@ Rails.application.configure do # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + # Action Cable should be mounted in a separate process for most production setups + # config.action_cable.url = 'wss://example.com/cable' + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. # config.force_ssl = true |