From db526f7b9b639eb1ef5a9fddac9c90bd6745cb7e Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Sun, 4 Oct 2015 13:31:46 +0200 Subject: [PATCH] ... --- Capfile | 2 +- config/deploy.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Capfile b/Capfile index 62b53d60..638bf1d6 100644 --- a/Capfile +++ b/Capfile @@ -22,7 +22,7 @@ require 'capistrano/rails/assets' # require 'capistrano/rails/migrations' require 'capistrano/puma' require 'capistrano/puma/monit' -require "airbrussh/capistrano" +#require "airbrussh/capistrano" # Loads custom tasks from `lib/capistrano/tasks' if you have any defined. Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r } diff --git a/config/deploy.rb b/config/deploy.rb index f6fdd5d2..772bc978 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -36,7 +36,7 @@ set :linked_dirs, %w{log tmp/pids tmp/cache tmp/sockets vendor/bundle public/sys # Default value for default_env is {} # set :default_env, { path: "/opt/ruby/bin:$PATH" } -set :default_env, {'DEPLOY' => 'yes'} +set :default_env, {'DEPLOY' => 'yes', 'RAILS_ENV' => 'production'} set :puma_threads, [4, 16] set :puma_workers, 2 @@ -105,8 +105,8 @@ namespace :deploy do #end #end rsync_host = host - #run_locally { execute "rsync -av --delete ./public/assets/ #{fetch(:user)}@#{rsync_host}:#{shared_path}/public/assets/" } - run_locally { execute "rsync -av ./public/assets/ #{fetch(:user)}@#{rsync_host}:#{shared_path}/public/assets/" } + run_locally { execute "rsync -av --delete ./public/assets/ #{fetch(:user)}@#{rsync_host}:#{shared_path}/public/assets/" } + #run_locally { execute "rsync -av ./public/assets/ #{fetch(:user)}@#{rsync_host}:#{shared_path}/public/assets/" } execute :chown, "-R www-data:www-data", shared_path.join('public/assets/') #run_locally { execute 'rm -rf public/assets' }