pixelforce_recipes 1.4 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4b5e21e690c3f0a6ef398cf285f22ff5e9c652d3
-  data.tar.gz: c415d1d498cdbe3684460c73dd4298efe4785334
+SHA256:
+  metadata.gz: 646a39fe331bfdfb9d399525d4727fbf3872eddaf7ef9da027928c64f2a8ccec
+  data.tar.gz: 12a83480e34c1da523d8aa82ce568f78e967bca86d633d64f352de589b08e920
 SHA512:
-  metadata.gz: 68d3980743a9b71969e2ce5339eb8417e26bc3b9c30ab4ccda765c74cd1c5acfe9708032cbbf287215ad016c6abe4e719792592e30527ce92629e3aaba37736c
-  data.tar.gz: e27fa4ca1a0ebc01467b18417351961f2e4dcd70c471e8321f4f23eb4571aa0a7dbe978b496e50c5e75f66cc408818cbc14b8a66eea455ad741e2dd83ce5896a
+  metadata.gz: e4b0912a870be8429c9c2811add7bc06e3854cd02bbec7fa3c973b3a1c312c02ba89d7c41c2febd12f3011e718f81b0809aee1ec367b6152ce7da2355741e755
+  data.tar.gz: 51d9cecf38a69ee98eeffe3a32403ff96c221f96601d28314aa9f030d7a36f95eb0fe64b49e48e8c310a11bcbb701d63a11666483155dcda83e3832b79e80cbe

data/Gemfile.lock

@@ -1,27 +1,27 @@
 PATH
   remote: .
   specs:
-    pixelforce_recipes (1.4)
+    pixelforce_recipes (1.8)
       capistrano (> 2.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    airbrussh (1.3.0)
+    airbrussh (1.4.0)
       sshkit (>= 1.6.1, != 1.7.0)
-    capistrano (3.11.0)
+    capistrano (3.12.0)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.2.5)
-    i18n (1.1.1)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (5.0.2)
-    rake (10.5.0)
+    net-scp (2.0.0)
+      net-ssh (>= 2.6.5, < 6.0.0)
+    net-ssh (5.2.0)
+    rake (13.0.1)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -35,7 +35,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    sshkit (1.17.0)
+    sshkit (1.20.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
 
@@ -45,8 +45,8 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.12)
   pixelforce_recipes!
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.15.0
+   1.16.6

data/README.md

@@ -34,8 +34,40 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/pixelforce_recipes. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
+## supervisor support
+
+The recipes for capistrano3 with supervisor support.   
+Please use `process:supervisor:task` to invoke it.   
+They relied on some capistrano plugins for some variables
+
+* [**rvm**](https://github.com/capistrano/rvm) for `rvm_ruby_version`
+
+Tweak some option for supervisor, the following value is default
+
+```ruby
+set :autostart, 'true'
+set :autorestart, 'true'
+set :logfile_maxbytes, '1GB'
+set :logfile_backups, '10'
+```
+
+#### unicorn
+
+Relied on unicornherder for supervisor monitoring.
+
+#### puma
+
+Get rid of capistrano-puma, and now generate puma config itself.
+
+```ruby
+set :puma_threads, [0, 1]
+set :puma_workers, 2
+```
+
+## sysvinit support
+
+Please use `process:sysvinit:task` to invoke it.
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/lib/pixelforce_recipes.rb

@@ -1,16 +1,10 @@
 require "pixelforce_recipes/version"
 require "capistrano"
 
-if defined?(Capistrano::VERSION) && Capistrano::VERSION.to_s.split('.').first.to_i >= 3
-  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/capistrano_3_recipes/base")
-  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/capistrano_3_recipes/sidekiq")
-  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/capistrano_3_recipes/resque")
-  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/capistrano_3_recipes/logrotate")
-else
-  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/legacy_recipes/base")
-  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/legacy_recipes/unicorn")
-  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/legacy_recipes/sidekiq")
-  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/legacy_recipes/resque")
-  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/legacy_recipes/puma")
-  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/legacy_recipes/logrotate")
-end
+if defined?(Capistrano::VERSION)
+  if Capistrano::VERSION.to_s.split('.').first.to_i >= 3
+    Dir[File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/capistrano_3_recipes/*.rb")].each {|file| require file }    
+  else
+    Dir[File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/legacy_recipes/*.rb")].each {|file| require file }    
+  end
+end

data/lib/pixelforce_recipes/capistrano_3_recipes/puma.rb

@@ -1,22 +1,63 @@
 namespace :puma do
 
   desc "Setup puma configuration for this application"
-  task :setup do
+  task :config do
     on roles(:web) do
-      template "puma_init.erb", "/tmp/puma"
-      sudo "mv /tmp/puma /etc/init.d/#{fetch(:application)}"
-      sudo "chmod +x /etc/init.d/#{fetch(:application)}"
-      sudo "update-rc.d #{fetch(:application)} defaults"
-      template "nginx_puma_config.erb", "/tmp/nginx_puma_config"
-      sudo "mv /tmp/nginx_puma_config /etc/nginx/sites-enabled/#{fetch(:application)}"
+      template "puma.rb.erb", "/tmp/puma_conf"
+      sudo "mv /tmp/puma_conf #{shared_path}/config/puma.rb"
     end
   end
+  namespace :sysvinit do
+    task :setup do
+      on roles(:web) do
+        template "puma_init.erb", "/tmp/puma"
+        sudo "mv /tmp/puma /etc/init.d/#{fetch(:application)}"
+        sudo "chmod +x /etc/init.d/#{fetch(:application)}"
+        sudo "update-rc.d #{fetch(:application)} defaults"
+        template "nginx_puma_config.erb", "/tmp/nginx_puma_config"
+        sudo "mv /tmp/nginx_puma_config /etc/nginx/sites-enabled/#{fetch(:application)}"
+      end
+    end
+
+    %w[start stop restart reload].each do |command|
+      desc "#{command} puma"
+      task command do
+        on roles(:web) do
+          execute "/etc/init.d/#{fetch(:application)} #{command}"
+        end
+      end
+    end
+  end
+  namespace :supervisor do
+    task :setup do
+      on roles(:web) do
+        template "puma_supervisor.erb", "/tmp/puma"
+        sudo "mv /tmp/puma /etc/supervisor/conf.d/#{fetch(:application)}.conf"
+        sudo "supervisorctl reread"
+        sudo "supervisorctl update" # it will auto start the application
+        template "nginx_puma_config.erb", "/tmp/nginx_puma_config"
+        sudo "mv /tmp/nginx_puma_config /etc/nginx/sites-enabled/#{fetch(:application)}"
+      end
+    end
 
-  %w[start stop restart].each do |command|
-    desc "#{command} puma"
-    task command do
+    task :start do
+      on roles(:web) do
+        execute "supervisorctl start #{fetch(:application)}"
+      end
+    end
+    task :stop do
+      on roles(:web) do
+        execute "supervisorctl signal INT #{fetch(:application)}"
+      end
+    end
+    task :restart do
+      on roles(:web) do
+        execute "supervisorctl signal USR1 #{fetch(:application)}"
+      end
+    end
+    task :reload do
       on roles(:web) do
-        execute "/etc/init.d/#{fetch(:application)} #{command}"
+        execute "supervisorctl signal USR2 #{fetch(:application)}"
       end
     end
   end

data/lib/pixelforce_recipes/capistrano_3_recipes/resque.rb

@@ -2,20 +2,41 @@ namespace :resque do
   desc "Install resque"
 
   desc "Setup resque configuration for this application"
-  task :setup do
-    on roles(:resque) do
-      template "resque_init.erb", "/tmp/resque"
-      sudo "mv /tmp/resque /etc/init.d/resque"
-      sudo "chmod +x /etc/init.d/resque"
-      sudo "update-rc.d resque defaults"
+  namespace :sysvinit do
+    task :setup do
+      on roles(:resque) do
+        template "resque_init.erb", "/tmp/resque"
+        sudo "mv /tmp/resque /etc/init.d/resque"
+        sudo "chmod +x /etc/init.d/resque"
+        sudo "update-rc.d resque defaults"
+      end
     end
-  end
 
-  %w[start stop restart].each do |command|
-    desc "#{command} resque"
-    task command do
+    %w[start stop restart].each do |command|
+      desc "#{command} resque"
+      task command do
+        on roles(:resque) do
+          execute "/etc/init.d/resque #{command}"
+        end
+      end
+    end
+  end
+  namespace :supervisor do
+    task :setup do
       on roles(:resque) do
-        execute "/etc/init.d/resque #{command}"
+        template "resque_supervisor.erb", "/tmp/resque"
+        sudo "mv /tmp/resque /etc/supervisor/conf.d/resque.conf"
+        sudo "supervisorctl reread"
+        sudo "supervisorctl update" # it will auto start the application
+      end
+    end
+
+    %w[start stop restart].each do |command|
+      desc "#{command} resque"
+      task command do
+        on roles(:resque) do
+          execute "supervisorctl #{command} resque"
+        end
       end
     end
   end

data/lib/pixelforce_recipes/capistrano_3_recipes/resque_scheduler.rb

@@ -0,0 +1,43 @@
+namespace :resque_scheduler do
+  desc "Install resque scheduler"
+
+  desc "Setup resque scheduler configuration for this application"
+  namespace :sysvinit do
+    task :setup do
+      on roles(:resque) do
+        template "resque_scheduler_init.erb", "/tmp/resque_scheduler"
+        sudo "mv /tmp/resque_scheduler /etc/init.d/resque_scheduler"
+        sudo "chmod +x /etc/init.d/resque_scheduler"
+        sudo "update-rc.d resque_scheduler defaults"
+      end
+    end
+
+    %w[start stop restart].each do |command|
+      desc "#{command} resque_scheduler"
+      task command do
+        on roles(:resque) do
+          execute "/etc/init.d/resque_scheduler #{command}"
+        end
+      end
+    end
+  end
+  namespace :supervisor do
+    task :setup do
+      on roles(:resque) do
+        template "resque_scheduler_supervisor.erb", "/tmp/resque_scheduler"
+        sudo "mv /tmp/resque_scheduler /etc/supervisor/conf.d/resque_scheduler.conf"
+        sudo "supervisorctl reread"
+        sudo "supervisorctl update" # it will auto start the application
+      end
+    end
+
+    %w[start stop restart].each do |command|
+      desc "#{command} resque_scheduler"
+      task command do
+        on roles(:resque) do
+          execute "supervisorctl #{command} resque_scheduler"
+        end
+      end
+    end
+  end
+end

data/lib/pixelforce_recipes/capistrano_3_recipes/sidekiq.rb

@@ -2,20 +2,74 @@ namespace :sidekiq do
   desc "Install sidekiq"
 
   desc "Setup sidekiq configuration for this application"
-  task :setup do
-    on roles(:sidekiq) do
-      template "sidekiq_init.erb", "/tmp/sidekiq"
-      sudo "mv /tmp/sidekiq /etc/init.d/sidekiq"
-      sudo "chmod +x /etc/init.d/sidekiq"
-      sudo "update-rc.d sidekiq defaults"
+  namespace :sysvinit do
+    task :setup do
+      on roles(:sidekiq) do
+        template "sidekiq_init.erb", "/tmp/sidekiq"
+        sudo "mv /tmp/sidekiq /etc/init.d/sidekiq"
+        sudo "chmod +x /etc/init.d/sidekiq"
+        sudo "update-rc.d sidekiq defaults"
+      end
     end
-  end
 
-  %w[start stop restart].each do |command|
-    desc "#{command} sidekiq"
-    task command do
-      on roles(:resque) do
-        execute "/etc/init.d/sidekiq #{command}"
+    %w[start stop restart].each do |command|
+      desc "#{command} sidekiq"
+      task command do
+        on roles(:sidekiq) do
+          execute "/etc/init.d/sidekiq #{command}"
+        end
+      end
+    end 
+  end 
+  namespace :supervisor do
+    task :setup do
+      on roles(:sidekiq) do
+        template "sidekiq_supervisor.erb", "/tmp/sidekiq"
+        sudo "mv /tmp/sidekiq /etc/supervisor/conf.d/sidekiq.conf"
+        sudo "supervisorctl reread"
+        sudo "supervisorctl update" # it will auto start the application
+      end
+    end
+
+    %w[start stop restart].each do |command|
+      desc "#{command} sidekiq"
+      task command do
+        on roles(:sidekiq) do
+          execute "supervisorctl #{command} sidekiq"
+        end
+      end
+    end
+    task :unload do
+      desc "tell sidekiq stop receive new jobs, called at the beginning"
+      on roles(:sidekiq) do
+        execute "supervisorctl signal TSTP sidekiq"
+      end
+    end
+    task :rolling_restart do
+      desc "used for rolling restart, only available on enterprise version"
+      on roles(:sidekiq) do
+        execute "supervisorctl signal USR2 sidekiq"
+      end
+    end
+
+    %w[start_group stop_group restart_group].each do |command|
+      desc "#{command} sidekiq"
+      task command do
+        on roles(:sidekiq) do
+          execute "supervisorctl #{command.split('_')[0]} sidekiq:*"
+        end
+      end
+    end
+    task :unload_group do
+      desc "tell sidekiq stop receive new jobs, called at the beginning"
+      on roles(:sidekiq) do
+        execute "supervisorctl signal TSTP sidekiq:*"
+      end
+    end
+    task :rolling_restart_group do
+      desc "used for rolling restart, only available on enterprise version"
+      on roles(:sidekiq) do
+        execute "supervisorctl signal USR2 sidekiq:*"
       end
     end
   end

data/lib/pixelforce_recipes/capistrano_3_recipes/supervisor.rb

@@ -0,0 +1,9 @@
+namespace :supervisor do
+  desc "Setup supervisor configuration for this application"
+  task :setup do
+    on roles(:app) do
+      template "supervisor.erb", "/tmp/supervisor"
+      sudo "mv /tmp/supervisor /etc/supervisor/supervisord.conf"
+    end
+  end
+end

data/lib/pixelforce_recipes/capistrano_3_recipes/unicorn.rb

@@ -1,23 +1,57 @@
 namespace :unicorn do
   desc "Install unicorn"
+  namespace :sysvinit do
+    task :setup do
+      on roles(:web) do
+        template "unicorn_init.erb", "/tmp/unicorn"
+        sudo "mv /tmp/unicorn /etc/init.d/#{fetch(:application)}"
+        sudo "chmod +x /etc/init.d/#{fetch(:application)}"
+        sudo "update-rc.d #{fetch(:application)} defaults"
+        template "nginx_config.erb", "/tmp/nginx_config"
+        sudo "mv /tmp/nginx_config /etc/nginx/sites-enabled/#{fetch(:application)}"
+      end
+    end
 
-  desc "Setup unicorn configuration for this application"
-  task :setup do
-    on roles(:web) do
-      template "unicorn_init.erb", "/tmp/unicorn"
-      sudo "mv /tmp/unicorn /etc/init.d/#{fetch(:application)}"
-      sudo "chmod +x /etc/init.d/#{fetch(:application)}"
-      sudo "update-rc.d #{fetch(:application)} defaults"
-      template "nginx_config.erb", "/tmp/nginx_config"
-      sudo "mv /tmp/nginx_config /etc/nginx/sites-enabled/#{fetch(:application)}"
+    %w[start stop restart reload].each do |command|
+      desc "#{command} unicorn"
+      task command do
+        on roles(:web) do
+          execute "/etc/init.d/#{fetch(:application)} #{command}"
+        end
+      end
     end
   end
+  namespace :supervisor do
+    desc "Setup unicorn configuration for this application"
+    task :setup do
+      on roles(:web) do
+        template "unicorn_supervisor.erb", "/tmp/unicorn"
+        sudo "mv /tmp/unicorn /etc/supervisor/conf.d/#{fetch(:application)}.conf"
+        sudo "supervisorctl reread"
+        sudo "supervisorctl update" # it will auto start the application
+        template "nginx_config.erb", "/tmp/nginx_config"
+        sudo "mv /tmp/nginx_config /etc/nginx/sites-enabled/#{fetch(:application)}"
+      end
+    end
 
-  %w[start stop restart].each do |command|
-    desc "#{command} unicorn"
-    task command do
+    task :start do
+      on roles(:web) do
+        execute "supervisorctl start #{fetch(:application)}"
+      end
+    end
+    task :stop do
+      on roles(:web) do
+        execute "supervisorctl signal QUIT #{fetch(:application)}"
+      end
+    end
+    task :restart do
+      on roles(:web) do
+        execute "supervisorctl signal USR2 #{fetch(:application)}"
+      end
+    end
+    task :reload do
       on roles(:web) do
-        execute "/etc/init.d/#{fetch(:application)} #{command}"
+        execute "supervisorctl signal HUP #{fetch(:application)}"
       end
     end
   end

data/lib/pixelforce_recipes/legacy_recipes/base.rb

@@ -3,7 +3,7 @@ if Capistrano::Configuration.instance(false)
   Capistrano::Configuration.instance(true).load do |instance|
 
     def template(from, to)
-      erb = File.read(File.expand_path("../templates/#{from}", __FILE__))
+      erb = File.read(File.expand_path("../../templates/#{from}", __FILE__))
       put ERB.new(erb).result(binding), to
     end
 

data/lib/pixelforce_recipes/legacy_recipes/resque_scheduler.rb

@@ -0,0 +1,22 @@
+if Capistrano::Configuration.instance(false)
+  Capistrano::Configuration.instance(true).load do |instance|
+    namespace :resque_scheduler do
+      desc "Install resque scheduler"
+
+      desc "Setup resque scheduler configuration for this application"
+      task :setup, roles: :resque do
+        template "resque_scheduler_init.erb", "/tmp/resque_scheduler"
+        run "#{sudo} mv /tmp/resque_scheduler /etc/init.d/resque_scheduler"
+        run "#{sudo} chmod +x /etc/init.d/resque_scheduler"
+        run "#{sudo} update-rc.d resque_scheduler defaults"
+      end
+
+      %w[start stop restart].each do |command|
+        desc "#{command} resque scheduler"
+        task command do
+          run "/etc/init.d/resque_scheduler #{command}"
+        end
+      end
+    end
+  end
+end

data/lib/pixelforce_recipes/templates/logrotate.erb

@@ -1,8 +1,10 @@
 <%= fetch(:deploy_to) %>/shared/log/*.log {
-  daily
+  su deploy deploy
+  maxsize 1G
+  weekly
   missingok
   copytruncate
-  rotate 7
+  rotate 5
   compress
   notifempty
-}
+}

data/lib/pixelforce_recipes/templates/nginx_config.erb

@@ -15,6 +15,9 @@ server {
   }
 
   location @<%= fetch(:application) %> {
+    proxy_set_header   X-Forwarded-Proto $scheme;
+    proxy_set_header   X-Forwarded-Ssl on;
+    proxy_set_header   X-Forwarded-Port 443;
     proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header   Host $http_host;
     proxy_redirect     off;
@@ -26,4 +29,4 @@ server {
   error_page 500 502 503 504 /500.html;
   client_max_body_size 1G;
   keepalive_timeout 10;
-}
+}

data/lib/pixelforce_recipes/templates/nginx_puma_config.erb

@@ -7,8 +7,6 @@ server {
   server_name <%= fetch(:server_address) %>;
 
   root <%= fetch(:deploy_to) %>/current/public;
-  access_log <%= fetch(:deploy_to) %>/current/log/nginx.access.log;
-  error_log <%= fetch(:deploy_to) %>/current/log/nginx.error.log info;
 
   location ^~ /assets/ {
     gzip_static on;
@@ -18,6 +16,7 @@ server {
 
   try_files $uri $uri @<%= fetch(:application) %>;
   location @<%= fetch(:application) %> {
+    proxy_set_header X-Forwarded-Proto $scheme;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $http_host;
     proxy_redirect off;
@@ -37,4 +36,4 @@ server {
   error_page 500 502 503 504 /500.html;
   client_max_body_size 10M;
   keepalive_timeout 10;
-}
+}

data/lib/pixelforce_recipes/templates/puma.rb.erb

@@ -0,0 +1,34 @@
+#!/usr/bin/env puma
+
+directory '<%= current_path %>'
+rackup '<%= current_path %>/config.ru'
+environment '<%= fetch(:rails_env, 'production') %>'
+tag '<%= fetch(:application)%>'
+pidfile '<%= shared_path %>/pids/puma.pid'
+state_path '<%= shared_path %>/pids/puma.state'
+stdout_redirect '<%= shared_path %>/log/<%= fetch(:application)%>.log', '<%= shared_path %>/log/<%= fetch(:application)%>.log', true
+
+threads <%= fetch(:puma_threads, [0, 1]).join(',')%>
+
+bind 'unix:///tmp/<%= fetch(:application)%>.sock'
+
+activate_control_app 'unix://<%= shared_path %>/tmp/sockets/pumactl.sock'
+
+workers <%= fetch(:puma_workers, 2) %>
+
+preload_app!
+
+on_restart do
+  puts 'Refreshing Gemfile'
+  ENV['BUNDLE_GEMFILE'] = '<%= current_path %>/Gemfile'
+end
+
+before_fork do
+  ActiveRecord::Base.connection_pool.disconnect!
+end
+
+on_worker_boot do
+  ActiveSupport.on_load(:active_record) do
+    ActiveRecord::Base.establish_connection
+  end
+end

data/lib/pixelforce_recipes/templates/puma_init.erb

@@ -13,7 +13,7 @@
 USER="<%= fetch(:user) %>"
 DAEMON=puma
 PROJECT_PATH="<%= fetch(:deploy_to) %>"
-DAEMON_OPTS="-e <%= fetch(:rails_env) %>"
+DAEMON_OPTS="-C $PROJECT_PATH/shared/config/puma.rb -e <%= fetch(:rails_env) %> -d"
 NAME=puma
 DESC="puma app for $USER"
 PID="$PROJECT_PATH/shared/pids/puma.pid"
@@ -33,17 +33,17 @@ case "$1" in
         ;;
   stop)
         echo -n "Stopping $DESC: "
-        kill -QUIT `cat $PID`
+        kill -INT `cat $PID`
         echo "$NAME."
         ;;
   restart)
         echo -n "Restarting $DESC: "
-        kill -USR2 `cat $PID`
+        kill -USR1 `cat $PID`
         echo "$NAME."
         ;;
   reload)
         echo -n "Reloading $DESC configuration: "
-        kill -HUP `cat $PID`
+        kill -USR2 `cat $PID`
         echo "$NAME."
         ;;
   *)
@@ -52,4 +52,4 @@ case "$1" in
         ;;
 esac
 
-exit 0
+exit 0

data/lib/pixelforce_recipes/templates/puma_supervisor.erb

@@ -0,0 +1,13 @@
+[program:<%= fetch(:application) %>]
+user=<%= fetch(:user) %>
+environment=HOME="/home/<%= fetch(:user) %>",USER="<%= fetch(:user) %>"
+directory=<%= fetch(:deploy_to) %>/current
+command=/home/<%= fetch(:user) %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version, '2.4.7') %> do bundle exec puma -C <%= fetch(:deploy_to) %>/shared/config/puma.rb -e <%= fetch(:rails_env) %>
+autostart=<%= fetch(:autostart, 'true') %>
+autorestart=<%= fetch(:autorestart, 'true') %>
+startsecs=5
+startretries=3
+stderr_logfile=<%= fetch(:deploy_to) %>/shared/log/<%= fetch(:application) %>.log
+stdout_logfile=<%= fetch(:deploy_to) %>/shared/log/<%= fetch(:rails_env) %>.log
+stdout_logfile_maxbytes=<%= fetch(:logfile_maxbytes, '5GB') %>
+stdout_logfile_backups=<%= fetch(:logfile_backups, '10') %>

data/lib/pixelforce_recipes/templates/resque_init.erb

@@ -10,7 +10,7 @@
 # Description:       starts resque
 ### END INIT INFO
 
-USER="deploy"
+USER="<%= fetch(:user) %>"
 PROJECT_PATH="<%= fetch(:deploy_to) %>"
 NAME=resque
 DESC="Resque app for $USER"
@@ -46,4 +46,4 @@ case "$1" in
         ;;
 esac
 
-exit 0
+exit 0

data/lib/pixelforce_recipes/templates/resque_scheduler_init.erb

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+### BEGIN INIT INFO
+# Provides:          resque scheduler
+# Required-Start:    $local_fs $remote_fs $network $syslog
+# Required-Stop:     $local_fs $remote_fs $network $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: resque scheduler worker via init.d
+# Description:       starts resque scheduler
+### END INIT INFO
+
+USER="<%= fetch(:user) %>"
+PROJECT_PATH="<%= fetch(:deploy_to) %>"
+NAME="resque_scheduler"
+DESC="Resque Scheduler for $USER"
+PID="$PROJECT_PATH/shared/pids/resque_scheduler.pid"
+LOGFILE="$PROJECT_PATH/shared/log/resque.log"
+CD_TO_APP_DIR="cd $PROJECT_PATH/current"
+
+
+case "$1" in
+  start)
+        START_DAEMON_PROCESS="bundle exec rake RAILS_ENV=<%= fetch(:rails_env) %> QUEUE='*' PIDFILE=$PID BACKGROUND=yes environment resque:scheduler 2>&1 > $LOGFILE"
+        echo -n "Starting $DESC: "
+        if [ `whoami` = 'root' ]; then
+          su - $USER -c "$CD_TO_APP_DIR > /dev/null 2>&1 && $START_DAEMON_PROCESS"
+        else
+          /bin/bash -l -c "$CD_TO_APP_DIR > /dev/null 2>&1 && $START_DAEMON_PROCESS"
+        fi
+        echo "$NAME."
+        ;;
+  stop)
+        STOP_DAEMON_PROCESS="test -f $PID && kill -s QUIT `cat $PID` && rm -f $PID"
+        echo -n "Stopping $DESC: "
+        if [ `whoami` = 'root' ]; then
+          su - $USER -c "$CD_TO_APP_DIR && $STOP_DAEMON_PROCESS"
+        else
+          /bin/bash -l -c "$CD_TO_APP_DIR && $STOP_DAEMON_PROCESS"
+        fi
+        echo "$NAME."
+        ;;
+  *)
+        echo "Usage: $NAME {start|stop|restart|reload}" >&2
+        exit 1
+        ;;
+esac
+
+exit 0

data/lib/pixelforce_recipes/templates/resque_scheduler_supervisor.erb

@@ -0,0 +1,13 @@
+[program:resque_scheduler]
+user=<%= fetch(:user) %>
+environment=HOME="/home/<%= fetch(:user) %>",USER="<%= fetch(:user) %>"
+directory=<%= fetch(:deploy_to) %>/current
+command=/home/<%= fetch(:user) %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version, '2.4.7') %> do bundle exec rake RAILS_ENV=<%= fetch(:rails_env) %> QUEUE='*' environment resque:scheduler 2>&1 > <%= fetch(:deploy_to) %>/shared/log/resque_scheduler.log
+autostart=<%= fetch(:autostart, 'true') %>
+autorestart=<%= fetch(:autorestart, 'true') %>
+stopsignal=QUIT
+startsecs=5
+startretries=3
+stdout_logfile=<%= fetch(:deploy_to) %>/shared/log/resque_scheduler.log
+stdout_logfile_maxbytes=<%= fetch(:logfile_maxbytes, '1GB') %>
+stdout_logfile_backups=<%= fetch(:logfile_backups, '10') %>

data/lib/pixelforce_recipes/templates/resque_supervisor.erb

@@ -0,0 +1,13 @@
+[program:resque]
+user=<%= fetch(:user) %>
+environment=HOME="/home/<%= fetch(:user) %>",USER="<%= fetch(:user) %>"
+directory=<%= fetch(:deploy_to) %>/current
+command=/home/<%= fetch(:user) %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version, '2.4.7') %> do bundle exec rake RAILS_ENV=<%= fetch(:rails_env) %> QUEUE=critical,default,mailers,low environment resque:work 2>&1 > <%= fetch(:deploy_to) %>/shared/log/resque.log
+autostart=<%= fetch(:autostart, 'true') %>
+autorestart=<%= fetch(:autorestart, 'true') %>
+stopsignal=QUIT
+startsecs=5
+startretries=3
+stdout_logfile=<%= fetch(:deploy_to) %>/shared/log/resque.log
+stdout_logfile_maxbytes=<%= fetch(:logfile_maxbytes, '1GB') %>
+stdout_logfile_backups=<%= fetch(:logfile_backups, '10') %>

data/lib/pixelforce_recipes/templates/sidekiq_init.erb

@@ -10,7 +10,7 @@
 # Description:       starts sidekiq
 ### END INIT INFO
 
-USER="deploy"
+USER="<%= fetch(:user) %>"
 DAEMON=sidekiq
 PROJECT_PATH="<%= fetch(:deploy_to) %>"
 NAME=sidekiq

data/lib/pixelforce_recipes/templates/sidekiq_supervisor.erb

@@ -0,0 +1,12 @@
+[program:sidekiq]
+user=<%= fetch(:user) %>
+environment=HOME="/home/<%= fetch(:user) %>",USER="<%= fetch(:user) %>"
+directory=<%= fetch(:deploy_to) %>/current
+command=/home/<%= fetch(:user) %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version, '2.4.7') %> do bundle exec sidekiq -L <%= fetch(:deploy_to) %>/shared/log/sidekiq.log -e <%= fetch(:rails_env) %>
+autostart=<%= fetch(:autostart, 'true') %>
+autorestart=<%= fetch(:autorestart, 'true') %>
+startsecs=5
+startretries=3
+stdout_logfile=<%= fetch(:deploy_to) %>/shared/log/sidekiq.log
+stdout_logfile_maxbytes=<%= fetch(:logfile_maxbytes, '1GB') %>
+stdout_logfile_backups=<%= fetch(:logfile_backups, '10') %>

data/lib/pixelforce_recipes/templates/supervisor.erb

@@ -0,0 +1,19 @@
+; Generated with pixelforce recipies
+[unix_http_server]
+file=/tmp/supervisor.sock    ; (the path to the socket file)
+chmod=0700                   ; sockef file mode (default 0700)
+
+[supervisord]
+user=<%= fetch(:user) %>
+logfile=/tmp/supervisord.log ; (main log file;default $CWD/supervisord.log)
+pidfile=/tmp/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///tmp/supervisor.sock
+
+[include]
+files = /etc/supervisor/conf.d/*.conf
+

data/lib/pixelforce_recipes/templates/unicorn_supervisor.erb

@@ -0,0 +1,13 @@
+[program:<%= fetch(:application) %>]
+user=<%= fetch(:user) %>
+environment=HOME="/home/<%= fetch(:user) %>",USER="<%= fetch(:user) %>"
+directory=<%= fetch(:deploy_to) %>/current
+command=/home/<%= fetch(:user) %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version, '2.4.7') %> do bundle exec unicornherder -u unicorn -p <%= fetch(:deploy_to) %>/shared/pids/unicorn.pid -- -c config/unicorn.rb -E <%= fetch(:rails_env) %>
+autostart=<%= fetch(:autostart, 'true') %>
+autorestart=<%= fetch(:autorestart, 'true') %>
+startsecs=5
+startretries=3
+stderr_logfile=<%= fetch(:deploy_to) %>/shared/log/<%= fetch(:application) %>.log
+stdout_logfile=<%= fetch(:deploy_to) %>/shared/log/<%= fetch(:rails_env) %>.log
+stdout_logfile_maxbytes=<%= fetch(:logfile_maxbytes, '5GB') %>
+stdout_logfile_backups=<%= fetch(:logfile_backups, '10') %>

data/lib/pixelforce_recipes/version.rb

@@ -1,3 +1,3 @@
 module PixelforceRecipes
-  VERSION = "1.4"
+  VERSION = "2.1"
 end

data/pixelforce_recipes.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_dependency(%q<capistrano>, ["> 2.0.0"])
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelforce_recipes
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '2.1'
 platform: ruby
 authors:
 - Ben Zhang
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-12-14 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -87,28 +87,39 @@ files:
 - lib/pixelforce_recipes/capistrano_3_recipes/logrotate.rb
 - lib/pixelforce_recipes/capistrano_3_recipes/puma.rb
 - lib/pixelforce_recipes/capistrano_3_recipes/resque.rb
+- lib/pixelforce_recipes/capistrano_3_recipes/resque_scheduler.rb
 - lib/pixelforce_recipes/capistrano_3_recipes/sidekiq.rb
+- lib/pixelforce_recipes/capistrano_3_recipes/supervisor.rb
 - lib/pixelforce_recipes/capistrano_3_recipes/unicorn.rb
 - lib/pixelforce_recipes/legacy_recipes/base.rb
 - lib/pixelforce_recipes/legacy_recipes/logrotate.rb
 - lib/pixelforce_recipes/legacy_recipes/puma.rb
 - lib/pixelforce_recipes/legacy_recipes/resque.rb
+- lib/pixelforce_recipes/legacy_recipes/resque_scheduler.rb
 - lib/pixelforce_recipes/legacy_recipes/sidekiq.rb
 - lib/pixelforce_recipes/legacy_recipes/unicorn.rb
 - lib/pixelforce_recipes/templates/logrotate.erb
 - lib/pixelforce_recipes/templates/nginx_config.erb
 - lib/pixelforce_recipes/templates/nginx_puma_config.erb
+- lib/pixelforce_recipes/templates/puma.rb.erb
 - lib/pixelforce_recipes/templates/puma_init.erb
+- lib/pixelforce_recipes/templates/puma_supervisor.erb
 - lib/pixelforce_recipes/templates/resque_init.erb
+- lib/pixelforce_recipes/templates/resque_scheduler_init.erb
+- lib/pixelforce_recipes/templates/resque_scheduler_supervisor.erb
+- lib/pixelforce_recipes/templates/resque_supervisor.erb
 - lib/pixelforce_recipes/templates/sidekiq_init.erb
+- lib/pixelforce_recipes/templates/sidekiq_supervisor.erb
+- lib/pixelforce_recipes/templates/supervisor.erb
 - lib/pixelforce_recipes/templates/unicorn_init.erb
+- lib/pixelforce_recipes/templates/unicorn_supervisor.erb
 - lib/pixelforce_recipes/version.rb
 - pixelforce_recipes.gemspec
 homepage: https://git.pixelforcesystems.com.au/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -123,9 +134,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Write a short summary, because Rubygems requires one.
 test_files: []