Merge branch 'master' of uflows.com:/var/git/qwaiter

config/deploy.rb

@@ -32,12 +32,23 @@ set :deploy_to, '/var/www/mozo.bar'
 # set :linked_files, %w{config/database.yml}
 
 # Default value for linked_dirs is []
-set :linked_dirs, %w{log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system}
+set :linked_dirs, %w{log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system public/assets}
 
 # Default value for default_env is {}
 # set :default_env, { path: "/opt/ruby/bin:$PATH" }
 set :default_env, {'DEPLOY' => 'yes'}
 
+set :puma_threads,    [4, 16]
+set :puma_workers,    2
+set :puma_bind,       "unix://#{shared_path}/tmp/sockets/app.sock"
+set :puma_state,      "#{shared_path}/tmp/pids/puma.state"
+set :puma_pid,        "#{shared_path}/tmp/pids/puma.pid"
+set :puma_access_log, "#{release_path}/log/puma.error.log"
+set :puma_error_log,  "#{release_path}/log/puma.access.log"
+set :puma_preload_app, true
+set :puma_worker_timeout, nil
+set :puma_init_active_record, false  # Change to true if using ActiveRecord
+
 # Default value for keep_releases is 5
 # set :keep_releases, 5
 
@@ -49,12 +60,12 @@ namespace :deploy do
       # Your restart mechanism here, for example:
        within release_path do
          #execute :rake, 'cache:clear', as: 'www-data'
-         with rails_env: fetch(:rails_env) do
-           execute :rake, 'dedigest_assets', as: 'www-data'
-         end
+         #with rails_env: fetch(:rails_env) do
+           #execute :rake, 'dedigest_assets', as: 'www-data'
+         #end
        end
-       execute :chown, "-R www-data:www-data", release_path
-       execute :chown, "-R www-data:www-data", release_path.join('public/assets/')
+       #execute :chown, "-R www-data:www-data", release_path
+       #execute :chown, "-R www-data:www-data", release_path.join('public/assets/')
        #execute :kill, capture("lsof -i:9022 -t") # kill counters, will reboot itself
        execute :touch, release_path.join('tmp/restart.txt')
     end
@@ -72,6 +83,43 @@ namespace :deploy do
 
   end
 
+  namespace :assets do
+
+    Rake::Task['deploy:assets:precompile'].clear_actions
+    Rake::Task['deploy:assets:backup_manifest'].clear_actions
+
+    desc 'Precompile assets locally and upload to servers'
+    task :precompile do
+      on roles(fetch(:assets_roles)) do
+        run_locally do
+          with rails_env: fetch(:rails_env) do
+            execute 'bin/rake assets:precompile'
+            execute 'bin/rake dedigest_assets'
+          end
+        end
+
+        #within release_path do
+          #with rails_env: fetch(:rails_env) do
+            #upload!('./public/assets/', "#{shared_path}/public/", recursive: true)
+          #end
+        #end
+        rsync_host = host
+        run_locally { execute "rsync -av --delete ./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' }
+      end
+    end
+
+  end
+  #desc 'Set config/puma.rb-symlink for upstart'
+  #task :puma_config do
+    #on roles(:app) do
+      #execute "ln -sf #{shared_path}/puma.rb #{release_path}/config/puma.rb"
+    #end
+  #end
+  #after :finishing, :puma_config
+
   after :publishing, :restart do
     #deploy.update_remote_cache
   end