aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2016-05-28 15:46:35 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2016-05-28 15:46:55 +0200
commitc7f950ad57e50ab68f50a55b2ad17238b9e9b708 (patch)
tree2053cd64f50226d782c38df45733e62cf00a7bb1 /railties/lib
parentf5f1caa0a74284a78eee00cdf1a322e8e3205103 (diff)
downloadrails-c7f950ad57e50ab68f50a55b2ad17238b9e9b708.tar.gz
rails-c7f950ad57e50ab68f50a55b2ad17238b9e9b708.tar.bz2
rails-c7f950ad57e50ab68f50a55b2ad17238b9e9b708.zip
Boil down custom Action Cable configuration to a single block
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt6
1 files changed, 2 insertions, 4 deletions
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 6bd5e42251..363af05459 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
@@ -37,12 +37,10 @@ Rails.application.configure do
# config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
<%- unless options[:skip_action_cable] -%>
- # Action Cable endpoint configuration
+ # Mount Action Cable outside main process or domain
+ # config.action_cable.mount_path = nil
# config.action_cable.url = 'wss://example.com/cable'
# config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
-
- # Don't mount Action Cable in the main server process.
- # config.action_cable.mount_path = nil
<%- end -%>
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.