From 58f82178b8ed1af2de03eb0d3607a962f0dac0e7 Mon Sep 17 00:00:00 2001 From: Sebastian Serth Date: Wed, 10 Oct 2018 14:09:13 +0200 Subject: [PATCH] Adopt deployment after refactoring and reset puma to default --- config/deploy.rb | 1 - config/puma.rb | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config/deploy.rb b/config/deploy.rb index be0cd539..6b72d746 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -19,7 +19,6 @@ namespace :deploy do after :compile_assets, :copy_vendor_assets do on roles(fetch(:assets_roles)) do within release_path do - execute :cp, '-r', 'vendor/assets/images/', 'public/assets/' execute :cp, '-r', 'vendor/assets/javascripts/ace', 'public/assets/' end end diff --git a/config/puma.rb b/config/puma.rb index 250c9bd3..a5eccf81 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -21,14 +21,14 @@ environment ENV.fetch("RAILS_ENV") { "development" } # Workers do not work on JRuby or Windows (both of which do not support # processes). # -workers ENV.fetch("WEB_CONCURRENCY") { 2 } +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } # Use the `preload_app!` method when specifying a `workers` number. # This directive tells Puma to first boot the application and load code # before forking the application. This takes advantage of Copy On Write # process behavior so workers use less memory. # -preload_app! +# preload_app! # Allow puma to be restarted by `rails restart` command. plugin :tmp_restart